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

Make touchscreen handling work with skinned lists.

Browse source 
Change-Id: I7df93319c8f16f05e840d74b022aab4803bb8f80
This commit is contained in:
Frank Gevaerts 2012-06-13 23:07:49 +02:00
parent 1a665aab1e
commit 7151111228
3 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/gui/bitmap/list-skinned.c
View file

@ -167,6 +167,20 @@ void skinlist_get_scrollbar(int* nb_item, int* first_shown, int* last_shown)
}
}
bool skinlist_get_item(struct screen *display, struct gui_synclist *list, int x, int y, int *item)
{
const int screen = display->screen_type;
if (!skinlist_is_configured(screen, list))
return false;
int row = y / listcfg[screen]->height;
int column = x / listcfg[screen]->width;
struct viewport *parent = (list->parent[screen]);
int cols = (parent->width / listcfg[screen]->width);
*item = row * cols+ column;
return true;
}
bool skinlist_draw(struct screen *display, struct gui_synclist *list)
{
int cur_line, display_lines;

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

@ -704,7 +704,7 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * list)
enum screen_type screen;
struct viewport *parent;
short x, y;
int action, adj_y, line, line_height, list_start_item;
int action, adj_x, adj_y, line, line_height, list_start_item;
bool recurse;
static int last_y = -1;
@ -714,6 +714,7 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * list)
list_start_item = list->start_item[screen];
/* start with getting the action code and finding the click location */
action = action_get_touchscreen_press(&x, &y);
adj_x = x - parent->x;
adj_y = y - parent->y;
@ -736,13 +737,17 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * list)
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 */
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)

2
apps/gui/list.h
View file

@ -188,6 +188,8 @@ struct listitem_viewport_cfg {
bool tile;
struct skin_viewport selected_item_vp;
};
bool skinlist_get_item(struct screen *display, struct gui_synclist *list, int x, int y, int *item);
bool skinlist_draw(struct screen *display, struct gui_synclist *list);
bool skinlist_is_selected_item(void);
void skinlist_set_cfg(enum screen_type screen,