diff options
author | Jens Arnold <amiconn@rockbox.org> | 2007-04-12 23:53:17 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2007-04-12 23:53:17 +0000 |
commit | c05ee023125a841e8e9311992aa134807a59fe73 (patch) | |
tree | 997f986976f3eb4d52728581faf67667c292653f /apps | |
parent | 6be615615d538813e3f6dbae46949c1fe9346524 (diff) | |
download | rockbox-c05ee023125a841e8e9311992aa134807a59fe73.tar.gz rockbox-c05ee023125a841e8e9311992aa134807a59fe73.zip |
Removed unused struct member from gui_synclist, and reordered struct members of gui_list for optimal packing.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13139 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/list.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/apps/gui/list.h b/apps/gui/list.h index 26f58761b6..bd43edf7ef 100644 --- a/apps/gui/list.h +++ b/apps/gui/list.h | |||
@@ -69,36 +69,37 @@ typedef char * list_get_name(int selected_item, | |||
69 | 69 | ||
70 | struct gui_list | 70 | struct gui_list |
71 | { | 71 | { |
72 | int nb_items; | ||
73 | int selected_item; | ||
74 | bool cursor_flash_state; | ||
75 | int start_item; /* the item that is displayed at the top of the screen */ | ||
76 | |||
77 | #ifdef HAVE_LCD_BITMAP | ||
78 | int offset_position; /* the list's screen scroll placement in pixels */ | ||
79 | #endif | ||
80 | list_get_icon *callback_get_item_icon; | ||
81 | list_get_name *callback_get_item_name; | ||
82 | |||
83 | struct screen * display; | ||
84 | /* defines wether the list should stop when reaching the top/bottom | 72 | /* defines wether the list should stop when reaching the top/bottom |
85 | * or should continue (by going to bottom/top) */ | 73 | * or should continue (by going to bottom/top) */ |
86 | bool limit_scroll; | 74 | bool limit_scroll; |
87 | /* wether the text of the whole items of the list have to be | 75 | /* wether the text of the whole items of the list have to be |
88 | * scrolled or only for the selected item */ | 76 | * scrolled or only for the selected item */ |
89 | bool scroll_all; | 77 | bool scroll_all; |
78 | bool cursor_flash_state; | ||
79 | |||
80 | int nb_items; | ||
81 | int selected_item; | ||
82 | int start_item; /* the item that is displayed at the top of the screen */ | ||
90 | /* the number of lines that are selected at the same time */ | 83 | /* the number of lines that are selected at the same time */ |
91 | int selected_size; | 84 | int selected_size; |
92 | /* The data that will be passed to the callback function YOU implement */ | ||
93 | void * data; | ||
94 | /* These are used to calculate how much of the screen content we need | 85 | /* These are used to calculate how much of the screen content we need |
95 | to redraw. */ | 86 | to redraw. */ |
96 | int last_displayed_selected_item; | 87 | int last_displayed_selected_item; |
97 | int last_displayed_start_item; | 88 | int last_displayed_start_item; |
98 | /* The optional title, set to NULL for none */ | 89 | #ifdef HAVE_LCD_BITMAP |
99 | char *title; | 90 | int offset_position; /* the list's screen scroll placement in pixels */ |
91 | #endif | ||
100 | /* Cache the width of the title string in pixels/characters */ | 92 | /* Cache the width of the title string in pixels/characters */ |
101 | int title_width; | 93 | int title_width; |
94 | |||
95 | list_get_icon *callback_get_item_icon; | ||
96 | list_get_name *callback_get_item_name; | ||
97 | |||
98 | struct screen * display; | ||
99 | /* The data that will be passed to the callback function YOU implement */ | ||
100 | void * data; | ||
101 | /* The optional title, set to NULL for none */ | ||
102 | char * title; | ||
102 | /* Optional title icon */ | 103 | /* Optional title icon */ |
103 | ICON title_icon; | 104 | ICON title_icon; |
104 | }; | 105 | }; |
@@ -166,7 +167,6 @@ extern void gui_list_screen_scroll_out_of_view(bool enable); | |||
166 | struct gui_synclist | 167 | struct gui_synclist |
167 | { | 168 | { |
168 | struct gui_list gui_list[NB_SCREENS]; | 169 | struct gui_list gui_list[NB_SCREENS]; |
169 | struct gui_list *last_displayed[NB_SCREENS]; | ||
170 | }; | 170 | }; |
171 | 171 | ||
172 | extern void gui_synclist_init( | 172 | extern void gui_synclist_init( |