summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorMaurus Cuelenaere <mcuelenaere@gmail.com>2010-02-13 15:53:10 +0000
committerMaurus Cuelenaere <mcuelenaere@gmail.com>2010-02-13 15:53:10 +0000
commit9ec0c1669cc9d10f8d38d165dd965c6c9277372d (patch)
treedc1e0ffad918952b515cebebc0f621b1b7591e9a /apps
parent841cffab5b825eee3972946725988eb2bca8583d (diff)
Touchscreen: fix scrollbar handling when it's on the right
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24635 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/bitmap/list.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c
index 9e222c1973..e209003372 100644
--- a/apps/gui/bitmap/list.c
+++ b/apps/gui/bitmap/list.c
@@ -352,12 +352,18 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * gui_list)
if (button == BUTTON_NONE)
return ACTION_NONE;
+
if (x > list_text_vp->x + list_text_vp->width)
{
- /* wider than the list's viewport, ignore it */
- return ACTION_NONE;
+ if (global_settings.scrollbar == SCROLLBAR_RIGHT &&
+ x > list_text_vp->x + list_text_vp->width + SCROLLBAR_WIDTH)
+ {
+ /* wider than the list's viewport, ignore it */
+ return ACTION_NONE;
+ }
}
- else if (x < list_text_vp->x)
+
+ if (x < list_text_vp->x)
{
/* Top left corner is GO_TO_ROOT */
if (y<list_text[SCREEN_MAIN].y)