From 9ec0c1669cc9d10f8d38d165dd965c6c9277372d Mon Sep 17 00:00:00 2001 From: Maurus Cuelenaere Date: Sat, 13 Feb 2010 15:53:10 +0000 Subject: 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 --- apps/gui/bitmap/list.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'apps/gui/bitmap/list.c') 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