diff options
| author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2010-02-13 15:53:10 +0000 |
|---|---|---|
| committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2010-02-13 15:53:10 +0000 |
| commit | 9ec0c1669cc9d10f8d38d165dd965c6c9277372d (patch) | |
| tree | dc1e0ffad918952b515cebebc0f621b1b7591e9a /apps/gui | |
| parent | 841cffab5b825eee3972946725988eb2bca8583d (diff) | |
| download | rockbox-9ec0c1669cc9d10f8d38d165dd965c6c9277372d.tar.gz rockbox-9ec0c1669cc9d10f8d38d165dd965c6c9277372d.zip | |
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/gui')
| -rw-r--r-- | apps/gui/bitmap/list.c | 12 |
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) | |||
| 352 | 352 | ||
| 353 | if (button == BUTTON_NONE) | 353 | if (button == BUTTON_NONE) |
| 354 | return ACTION_NONE; | 354 | return ACTION_NONE; |
| 355 | |||
| 355 | if (x > list_text_vp->x + list_text_vp->width) | 356 | if (x > list_text_vp->x + list_text_vp->width) |
| 356 | { | 357 | { |
| 357 | /* wider than the list's viewport, ignore it */ | 358 | if (global_settings.scrollbar == SCROLLBAR_RIGHT && |
| 358 | return ACTION_NONE; | 359 | x > list_text_vp->x + list_text_vp->width + SCROLLBAR_WIDTH) |
| 360 | { | ||
| 361 | /* wider than the list's viewport, ignore it */ | ||
| 362 | return ACTION_NONE; | ||
| 363 | } | ||
| 359 | } | 364 | } |
| 360 | else if (x < list_text_vp->x) | 365 | |
| 366 | if (x < list_text_vp->x) | ||
| 361 | { | 367 | { |
| 362 | /* Top left corner is GO_TO_ROOT */ | 368 | /* Top left corner is GO_TO_ROOT */ |
| 363 | if (y<list_text[SCREEN_MAIN].y) | 369 | if (y<list_text[SCREEN_MAIN].y) |