diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2012-06-13 23:07:49 +0200 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2012-06-19 22:02:59 +0200 |
commit | 715111122837440d3a1463d0d6932c469418dcbb (patch) | |
tree | deb2c8485c4f0aed36659b26f80313b8a8fbb507 /apps/gui/bitmap/list.c | |
parent | 1a665aab1e1e32e7355bc390fe4b09ff26d59082 (diff) | |
download | rockbox-715111122837440d3a1463d0d6932c469418dcbb.tar.gz rockbox-715111122837440d3a1463d0d6932c469418dcbb.zip |
Make touchscreen handling work with skinned lists.
Change-Id: I7df93319c8f16f05e840d74b022aab4803bb8f80
Diffstat (limited to 'apps/gui/bitmap/list.c')
-rw-r--r-- | apps/gui/bitmap/list.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c index 3a45a8124c..aad3eda98f 100644 --- a/apps/gui/bitmap/list.c +++ b/apps/gui/bitmap/list.c | |||
@@ -704,7 +704,7 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * list) | |||
704 | enum screen_type screen; | 704 | enum screen_type screen; |
705 | struct viewport *parent; | 705 | struct viewport *parent; |
706 | short x, y; | 706 | short x, y; |
707 | int action, adj_y, line, line_height, list_start_item; | 707 | int action, adj_x, adj_y, line, line_height, list_start_item; |
708 | bool recurse; | 708 | bool recurse; |
709 | static int last_y = -1; | 709 | static int last_y = -1; |
710 | 710 | ||
@@ -714,6 +714,7 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * list) | |||
714 | list_start_item = list->start_item[screen]; | 714 | list_start_item = list->start_item[screen]; |
715 | /* start with getting the action code and finding the click location */ | 715 | /* start with getting the action code and finding the click location */ |
716 | action = action_get_touchscreen_press(&x, &y); | 716 | action = action_get_touchscreen_press(&x, &y); |
717 | adj_x = x - parent->x; | ||
717 | adj_y = y - parent->y; | 718 | adj_y = y - parent->y; |
718 | 719 | ||
719 | 720 | ||
@@ -736,13 +737,17 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * list) | |||
736 | line = 0; /* silence gcc 'used uninitialized' warning */ | 737 | line = 0; /* silence gcc 'used uninitialized' warning */ |
737 | if (click_loc & LIST) | 738 | if (click_loc & LIST) |
738 | { | 739 | { |
739 | /* selection needs to be corrected if items are only partially visible */ | 740 | if(!skinlist_get_item(&screens[screen], list, adj_x, adj_y, &line)) |
740 | line = (adj_y - y_offset) / line_height; | 741 | { |
741 | if (list_display_title(list, screen)) | 742 | /* selection needs to be corrected if items are only partially visible */ |
742 | line -= 1; /* adjust for the list title */ | 743 | line = (adj_y - y_offset) / line_height; |
744 | if (list_display_title(list, screen)) | ||
745 | line -= 1; /* adjust for the list title */ | ||
746 | } | ||
743 | if (line >= list->nb_items) | 747 | if (line >= list->nb_items) |
744 | return ACTION_NONE; | 748 | return ACTION_NONE; |
745 | list->selected_item = list_start_item+line; | 749 | list->selected_item = list_start_item+line; |
750 | |||
746 | gui_synclist_speak_item(list); | 751 | gui_synclist_speak_item(list); |
747 | } | 752 | } |
748 | if (action == BUTTON_TOUCHSCREEN) | 753 | if (action == BUTTON_TOUCHSCREEN) |