summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurus Cuelenaere <mcuelenaere@gmail.com>2009-08-22 21:46:02 +0000
committerMaurus Cuelenaere <mcuelenaere@gmail.com>2009-08-22 21:46:02 +0000
commit07b2708892196f79853167088e25b443fac0e331 (patch)
tree395203df428b0e8cd775c59342b32487de29f9c5
parent40952de355f14f3844d321d51e527bc4ea4af18b (diff)
downloadrockbox-07b2708892196f79853167088e25b443fac0e331.tar.gz
rockbox-07b2708892196f79853167088e25b443fac0e331.zip
Touchscreen list handling: fix issue where scrolling with the scrollbar could bring up the context menu for an item
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22465 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/bitmap/list.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c
index 71c74dbd09..743ab813af 100644
--- a/apps/gui/bitmap/list.c
+++ b/apps/gui/bitmap/list.c
@@ -94,7 +94,7 @@ static bool draw_title(struct screen *display, struct gui_synclist *list)
94 display->puts_scroll_style(0, 0, list->title, style); 94 display->puts_scroll_style(0, 0, list->title, style);
95 return true; 95 return true;
96} 96}
97 97
98void list_draw(struct screen *display, struct gui_synclist *list) 98void list_draw(struct screen *display, struct gui_synclist *list)
99{ 99{
100 struct viewport list_icons; 100 struct viewport list_icons;
@@ -298,6 +298,8 @@ static int gui_synclist_touchscreen_scrollbar(struct gui_synclist * gui_list,
298 int nb_lines = viewport_get_nb_lines(&list_text[screen]); 298 int nb_lines = viewport_get_nb_lines(&list_text[screen]);
299 if (nb_lines < gui_list->nb_items) 299 if (nb_lines < gui_list->nb_items)
300 { 300 {
301 scrolling = true;
302
301 int scrollbar_size = nb_lines* 303 int scrollbar_size = nb_lines*
302 font_get(gui_list->parent[screen]->font)->height; 304 font_get(gui_list->parent[screen]->font)->height;
303 int actual_y = y - list_text[screen].y; 305 int actual_y = y - list_text[screen].y;