devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix FS#11552 - touches outside of the UI viewport can do unexpected list movements.

Browse source 
Also remove naughty // comments from r28145

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28168 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2010-09-26 07:32:16 +00:00
parent 562437b8e7
commit 0dd8ba4725
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
apps/gui/bitmap/list.c
View file

@ -372,14 +372,14 @@ static int gui_synclist_touchscreen_scrolling(struct gui_synclist * gui_list, in
const int screen = screens[SCREEN_MAIN].screen_type; const int screen = screens[SCREEN_MAIN].screen_type;
const int difference = position - last_position; const int difference = position - last_position;
const int nb_lines = viewport_get_nb_lines(&list_text[screen]); const int nb_lines = viewport_get_nb_lines(&list_text[screen]);
if(nb_lines < gui_list->nb_items && difference != 0) // only scroll if needed if(nb_lines < gui_list->nb_items && difference != 0) /* only scroll if needed */
{ {
int new_start_item; int new_start_item;
new_start_item = gui_list->start_item[screen] - difference; new_start_item = gui_list->start_item[screen] - difference;
// check if new_start_item is bigger than list item count /* check if new_start_item is bigger than list item count */
if(new_start_item > gui_list->nb_items - nb_lines) if(new_start_item > gui_list->nb_items - nb_lines)
new_start_item = gui_list->nb_items - nb_lines; new_start_item = gui_list->nb_items - nb_lines;
// set new_start_item to 0 if it's negative /* set new_start_item to 0 if it's negative */
if(new_start_item < 0) if(new_start_item < 0)
new_start_item = 0; new_start_item = 0;
gui_list->start_item[screen] = new_start_item; gui_list->start_item[screen] = new_start_item;
@ -397,6 +397,10 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * gui_list)
const bool old_released = released; const bool old_released = released;
int line, list_width = list_text_vp->width; int line, list_width = list_text_vp->width;
/* make sure it is inside the UI viewport */
if (!viewport_point_within_vp(sb_skin_get_info_vp(screen), x, y))
return BUTTON_NONE;
released = (button&BUTTON_REL) != 0; released = (button&BUTTON_REL) != 0;
if (global_settings.scrollbar == SCROLLBAR_RIGHT) if (global_settings.scrollbar == SCROLLBAR_RIGHT)
@ -408,7 +412,6 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * gui_list)
if (x > list_text_vp->x + list_width) if (x > list_text_vp->x + list_width)
return ACTION_NONE; return ACTION_NONE;
/* make sure it is inside the UI viewport */
if (list_display_title(gui_list, screen) && if (list_display_title(gui_list, screen) &&
viewport_point_within_vp(&title_text[screen], x, y) && viewport_point_within_vp(&title_text[screen], x, y) &&
button == BUTTON_REL && scroll_mode == SCROLL_NONE) button == BUTTON_REL && scroll_mode == SCROLL_NONE)
@ -517,7 +520,7 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * gui_list)
scroll_mode = SCROLL_NONE; scroll_mode = SCROLL_NONE;
redraw = true; redraw = true;
} }
/* select current item */ /* select current item */
gui_synclist_select_item(gui_list, list_start_item+line); gui_synclist_select_item(gui_list, list_start_item+line);
if (last_position == 0) if (last_position == 0)