From 1392dc2144a4b1810ba5c421f54e05dc1a3a74c7 Mon Sep 17 00:00:00 2001 From: Maurus Cuelenaere Date: Sat, 23 Aug 2008 09:46:38 +0000 Subject: Commit FS#9308: differentiate between TOUCHPAD & TOUCHSCREEN git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18338 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/color_picker.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'apps/gui/color_picker.c') diff --git a/apps/gui/color_picker.c b/apps/gui/color_picker.c index 87af8ae3ed..d1ac2a9103 100644 --- a/apps/gui/color_picker.c +++ b/apps/gui/color_picker.c @@ -330,13 +330,13 @@ static void draw_screen(struct screen *display, char *title, set_drawinfo(display, DRMODE_SOLID, text_color, background_color); } -#ifdef HAVE_TOUCHPAD -static int touchpad_slider(struct rgb_pick *rgb, int *selected_slider) +#ifdef HAVE_TOUCHSCREEN +static int touchscreen_slider(struct rgb_pick *rgb, int *selected_slider) { short x,y; int text_top,i,x1; int slider_left, slider_width; - unsigned button = action_get_touchpad_press(&x, &y); + unsigned button = action_get_touchscreen_press(&x, &y); bool display_three_rows; int max_label_width; struct screen *display = &screens[SCREEN_MAIN]; @@ -426,9 +426,9 @@ bool set_color(struct screen *display, char *title, unsigned *color, } button = get_action(CONTEXT_SETTINGS_COLOURCHOOSER, TIMEOUT_BLOCK); -#ifdef HAVE_TOUCHPAD - if (button == ACTION_TOUCHPAD) - button = touchpad_slider(&rgb, &slider); +#ifdef HAVE_TOUCHSCREEN + if (button == ACTION_TOUCHSCREEN) + button = touchscreen_slider(&rgb, &slider); #endif switch (button) -- cgit v1.2.3