summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/gui/bitmap/list.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c
index fa015bf71a..b5e253d486 100644
--- a/apps/gui/bitmap/list.c
+++ b/apps/gui/bitmap/list.c
@@ -347,8 +347,7 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * gui_list)
347 short x, y; 347 short x, y;
348 const int button = action_get_touchscreen_press(&x, &y); 348 const int button = action_get_touchscreen_press(&x, &y);
349 int line; 349 int line;
350 const struct screen *display = &screens[SCREEN_MAIN]; 350 const int screen = SCREEN_MAIN;
351 const int screen = display->screen_type;
352 const int list_start_item = gui_list->start_item[screen]; 351 const int list_start_item = gui_list->start_item[screen];
353 const struct viewport *list_text_vp = &list_text[screen]; 352 const struct viewport *list_text_vp = &list_text[screen];
354 int list_width = list_text_vp->width; 353 int list_width = list_text_vp->width;
@@ -360,6 +359,11 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * gui_list)
360 return ACTION_NONE; 359 return ACTION_NONE;
361 360
362 /* make sure it is inside the UI viewport */ 361 /* make sure it is inside the UI viewport */
362 if (list_display_title(gui_list, screen) &&
363 viewport_point_within_vp(&title_text[screen], x, y) &&
364 button == BUTTON_REL)
365 return ACTION_STD_CANCEL;
366
363 if (!viewport_point_within_vp(list_text_vp, x, y)) 367 if (!viewport_point_within_vp(list_text_vp, x, y))
364 /* wider than the list's viewport, ignore it */ 368 /* wider than the list's viewport, ignore it */
365 return ACTION_NONE; 369 return ACTION_NONE;
@@ -467,9 +471,6 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * gui_list)
467 else 471 else
468 return ACTION_NONE; 472 return ACTION_NONE;
469 } 473 }
470 /* Everything above the items is cancel */
471 else if (y < list_text_vp->y && button == BUTTON_REL)
472 return ACTION_STD_CANCEL;
473 } 474 }
474 return ACTION_NONE; 475 return ACTION_NONE;
475} 476}