Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

touchscreen: Fix kinetic and swipe scrolling outside of the list viewport.

Browse source 
There were some bugs, especially when the user scrolled above the
list viewport. One bug made Rockbox completely unusable once triggered.

Change-Id: I9bb4722ff4381db189058e9a19ea30b2c69e87d9
This commit is contained in:
Thomas Martitz 2013-01-17 23:26:37 +01:00
parent 9b7edbf609
commit 2ffde90c69
1 changed files with 61 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -732,7 +732,8 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * list)
short x, y; short x, y;
int action, adj_x, adj_y, line, line_height, list_start_item; int action, adj_x, adj_y, line, line_height, list_start_item;
bool recurse; bool recurse;
static int last_y = -1; static bool initial_touch = true;
static int last_y;
screen = SCREEN_MAIN; screen = SCREEN_MAIN;
parent = list->parent[screen]; parent = list->parent[screen];
@ -752,67 +753,68 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * list)
{ {
case SCROLL_NONE: case SCROLL_NONE:
{ {
if (last_y == -1) int click_loc;
{ /* first run. register adj_y and re-run (will then take the else case) */ if (initial_touch)
last_y = adj_y; {
recurse = true; /* on the first touch last_y has to be reset to avoid
} * glitches with touches from long ago */
else last_y = adj_y;
initial_touch = false;
}
line = 0; /* silence gcc 'used uninitialized' warning */
click_loc = get_click_location(list, x, y);
if (click_loc & LIST)
{
if(!skinlist_get_item(&screens[screen], list, adj_x, adj_y, &line))
{
/* 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 */
}
if (line >= list->nb_items)
return ACTION_NONE;
list->selected_item = list_start_item+line;
gui_synclist_speak_item(list);
}
if (action == BUTTON_TOUCHSCREEN)
{
/* if not scrolling, the user is trying to select */
int diff = adj_y - last_y;
if ((click_loc & LIST) && swipe_scroll(list, diff))
scroll_mode = SCROLL_SWIPE;
else if (click_loc & SCROLLBAR)
scroll_mode = SCROLL_BAR;
}
else if (action == BUTTON_REPEAT)
{ {
int click_loc = get_click_location(list, x, y);
line = 0; /* silence gcc 'used uninitialized' warning */
if (click_loc & LIST) if (click_loc & LIST)
{ {
if(!skinlist_get_item(&screens[screen], list, adj_x, adj_y, &line)) /* held a single line for a while, bring up the context menu */
{ gui_synclist_select_item(list, list_start_item + line);
/* selection needs to be corrected if items are only partially visible */ /* don't sent context repeatedly */
line = (adj_y - y_offset) / line_height; action_wait_for_release();
if (list_display_title(list, screen)) initial_touch = true;
line -= 1; /* adjust for the list title */ return ACTION_STD_CONTEXT;
}
if (line >= list->nb_items)
return ACTION_NONE;
list->selected_item = list_start_item+line;
gui_synclist_speak_item(list);
} }
if (action == BUTTON_TOUCHSCREEN) }
{ else if (action & BUTTON_REL)
/* if not scrolling, the user is trying to select */ {
int diff = adj_y - last_y; initial_touch = true;
if ((click_loc & LIST) && swipe_scroll(list, diff)) if (click_loc & LIST)
scroll_mode = SCROLL_SWIPE; { /* release on list item enters it */
else if (click_loc & SCROLLBAR) gui_synclist_select_item(list, list_start_item + line);
scroll_mode = SCROLL_BAR; return ACTION_STD_OK;
} }
else if (action == BUTTON_REPEAT) else if (click_loc & TITLE_TEXT)
{ { /* clicking the title goes one level up (cancel) */
if (click_loc & LIST) return ACTION_STD_CANCEL;
{
/* held a single line for a while, bring up the context menu */
gui_synclist_select_item(list, list_start_item + line);
/* don't sent context repeatedly */
action_wait_for_release();
last_y = -1;
return ACTION_STD_CONTEXT;
}
} }
else if (action & BUTTON_REL) else if (click_loc & TITLE_ICON)
{ { /* clicking the title icon goes back to the root */
last_y = -1; return ACTION_STD_MENU;
if (click_loc & LIST)
{ /* release on list item enters it */
gui_synclist_select_item(list, list_start_item + line);
return ACTION_STD_OK;
}
else if (click_loc & TITLE_TEXT)
{ /* clicking the title goes one level up (cancel) */
return ACTION_STD_CANCEL;
}
else if (click_loc & TITLE_ICON)
{ /* clicking the title icon goes back to the root */
return ACTION_STD_MENU;
}
} }
} }
break; break;
@ -842,7 +844,7 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * list)
scroll_mode = SCROLL_NONE; scroll_mode = SCROLL_NONE;
if (scroll_mode == SCROLL_NONE) if (scroll_mode == SCROLL_NONE)
last_y = -1; initial_touch = true;
break; break;
} }
case SCROLL_KINETIC: case SCROLL_KINETIC:
@ -879,8 +881,8 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * list)
} }
} }
/* register y position unless forcefully reset to 1- */ /* register y position unless forcefully reset */
if (last_y >= 0) if (!initial_touch)
last_y = adj_y; last_y = adj_y;
return recurse ? gui_synclist_do_touchscreen(list) : ACTION_REDRAW; return recurse ? gui_synclist_do_touchscreen(list) : ACTION_REDRAW;