diff options
Diffstat (limited to 'apps/gui/color_picker.c')
-rw-r--r-- | apps/gui/color_picker.c | 12 |
1 files changed, 6 insertions, 6 deletions
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, | |||
330 | set_drawinfo(display, DRMODE_SOLID, text_color, background_color); | 330 | set_drawinfo(display, DRMODE_SOLID, text_color, background_color); |
331 | } | 331 | } |
332 | 332 | ||
333 | #ifdef HAVE_TOUCHPAD | 333 | #ifdef HAVE_TOUCHSCREEN |
334 | static int touchpad_slider(struct rgb_pick *rgb, int *selected_slider) | 334 | static int touchscreen_slider(struct rgb_pick *rgb, int *selected_slider) |
335 | { | 335 | { |
336 | short x,y; | 336 | short x,y; |
337 | int text_top,i,x1; | 337 | int text_top,i,x1; |
338 | int slider_left, slider_width; | 338 | int slider_left, slider_width; |
339 | unsigned button = action_get_touchpad_press(&x, &y); | 339 | unsigned button = action_get_touchscreen_press(&x, &y); |
340 | bool display_three_rows; | 340 | bool display_three_rows; |
341 | int max_label_width; | 341 | int max_label_width; |
342 | struct screen *display = &screens[SCREEN_MAIN]; | 342 | struct screen *display = &screens[SCREEN_MAIN]; |
@@ -426,9 +426,9 @@ bool set_color(struct screen *display, char *title, unsigned *color, | |||
426 | } | 426 | } |
427 | 427 | ||
428 | button = get_action(CONTEXT_SETTINGS_COLOURCHOOSER, TIMEOUT_BLOCK); | 428 | button = get_action(CONTEXT_SETTINGS_COLOURCHOOSER, TIMEOUT_BLOCK); |
429 | #ifdef HAVE_TOUCHPAD | 429 | #ifdef HAVE_TOUCHSCREEN |
430 | if (button == ACTION_TOUCHPAD) | 430 | if (button == ACTION_TOUCHSCREEN) |
431 | button = touchpad_slider(&rgb, &slider); | 431 | button = touchscreen_slider(&rgb, &slider); |
432 | #endif | 432 | #endif |
433 | 433 | ||
434 | switch (button) | 434 | switch (button) |