summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2009-12-21 04:42:20 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2009-12-21 04:42:20 +0000
commit88ae46cc88acf38c72ce3f9f7618d07007c92cd7 (patch)
treeff2b80c1da411c2b54c4c7d7a03464557f911b53
parent0201a19d2d80b2dbbeb3f4d6a9904fc552644616 (diff)
downloadrockbox-88ae46cc88acf38c72ce3f9f7618d07007c92cd7.tar.gz
rockbox-88ae46cc88acf38c72ce3f9f7618d07007c92cd7.tar.bz2
rockbox-88ae46cc88acf38c72ce3f9f7618d07007c92cd7.zip
fix another bug from FS#10771 - list touchscreen handling needs to ignore presses outside the list viewport.
It probably makes sense to pass off any button presses outside of the list viewport to the sbs, I'll leave that for someone else though git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24086 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/bitmap/list.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c
index dd4d41f95f..e0b68c42a4 100644
--- a/apps/gui/bitmap/list.c
+++ b/apps/gui/bitmap/list.c
@@ -340,7 +340,12 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * gui_list)
if (button == BUTTON_NONE)
return ACTION_NONE;
- if (x < list_text_vp->x)
+ if (x > list_text_vp->x + list_text_vp->width)
+ {
+ /* wider than the list's viewport, ignore it */
+ return ACTION_NONE;
+ }
+ else if (x < list_text_vp->x)
{
/* Top left corner is GO_TO_ROOT */
if (y<list_text[SCREEN_MAIN].y)