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

touchscreen: fix some issues/crashes with clicking the list title.

Browse source 
Change-Id: I31adb012ac39f9b27f6b91f5077ed4195ba1dc02
This commit is contained in:
Thomas Martitz 2012-04-10 10:08:30 +02:00
parent b7bc240489
commit d3ead233a8
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -716,10 +716,6 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * list)
action = action_get_touchscreen_press(&x, &y); action = action_get_touchscreen_press(&x, &y);
adj_y = y - parent->y; adj_y = y - parent->y;
/* selection needs to be corrected if items are only partially visible */
line = (adj_y - y_offset) / line_height;
if (list_display_title(list, screen))
line -= 1; /* adjust for the list title */
/* some defaults before running the state machine */ /* some defaults before running the state machine */
recurse = false; recurse = false;
@ -729,8 +725,6 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * list)
{ {
case SCROLL_NONE: case SCROLL_NONE:
{ {
list->selected_item = list_start_item+line;
gui_synclist_speak_item(list);
if (!last_y) if (!last_y)
{ /* first run. register adj_y and re-run (will then take the else case) */ { /* first run. register adj_y and re-run (will then take the else case) */
last_y = adj_y; last_y = adj_y;
@ -739,6 +733,16 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * list)
else else
{ {
int click_loc = get_click_location(list, x, y); int click_loc = get_click_location(list, x, y);
line = 0; /* silence gcc 'used uninitialized' warning */
if (click_loc & LIST)
{
/* selection needs to be corrected if items are only partially visible */
line = (adj_y - y_offset) / line_height;
if (list_display_title(list, screen))
line -= 1; /* adjust for the list title */
list->selected_item = list_start_item+line;
gui_synclist_speak_item(list);
}
if (action == BUTTON_TOUCHSCREEN) if (action == BUTTON_TOUCHSCREEN)
{ {
/* if not scrolling, the user is trying to select */ /* if not scrolling, the user is trying to select */
@ -748,7 +752,8 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * list)
else if (click_loc & SCROLLBAR) else if (click_loc & SCROLLBAR)
scroll_mode = SCROLL_BAR; scroll_mode = SCROLL_BAR;
hide_selection = click_loc & SCROLLBAR; /* only show selection bar if clicking the list */
hide_selection = click_loc & (SCROLLBAR|TITLE);
} }
else if (action == BUTTON_REPEAT) else if (action == BUTTON_REPEAT)
{ {