summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTeruaki Kawashima <teru@rockbox.org>2010-02-21 13:32:52 +0000
committerTeruaki Kawashima <teru@rockbox.org>2010-02-21 13:32:52 +0000
commitdafcd1470acaced405fa1a67d008aa1b68d1b6dd (patch)
tree745e97fbf7babf0ece064aaa619a956a7bc19de3
parent2ec0312353e7dfd27ef120aedf5876d92c0c6589 (diff)
downloadrockbox-dafcd1470acaced405fa1a67d008aa1b68d1b6dd.tar.gz
rockbox-dafcd1470acaced405fa1a67d008aa1b68d1b6dd.zip
remove unused fields from struct gui_synclist.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24807 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/charcell/list.c4
-rw-r--r--apps/gui/list.c17
-rw-r--r--apps/gui/list.h6
3 files changed, 0 insertions, 27 deletions
diff --git a/apps/gui/charcell/list.c b/apps/gui/charcell/list.c
index 220144c356..f36d3c9f7d 100644
--- a/apps/gui/charcell/list.c
+++ b/apps/gui/charcell/list.c
@@ -65,10 +65,6 @@ void list_draw(struct screen *display, struct gui_synclist *gui_list)
65 display->clear_display(); 65 display->clear_display();
66 start = 0; 66 start = 0;
67 end = display->getnblines(); 67 end = display->getnblines();
68 gui_list->last_displayed_start_item[display->screen_type] =
69 gui_list->start_item[display->screen_type];
70
71 gui_list->last_displayed_selected_item = gui_list->selected_item;
72 68
73 /* Adjust the position of icon, cursor, text for the list */ 69 /* Adjust the position of icon, cursor, text for the list */
74 draw_cursor = true; 70 draw_cursor = true;
diff --git a/apps/gui/list.c b/apps/gui/list.c
index 0c05e01785..a3b822503b 100644
--- a/apps/gui/list.c
+++ b/apps/gui/list.c
@@ -155,7 +155,6 @@ void gui_synclist_init(struct gui_synclist * gui_list,
155 FOR_NB_SCREENS(i) 155 FOR_NB_SCREENS(i)
156 { 156 {
157 gui_list->start_item[i] = 0; 157 gui_list->start_item[i] = 0;
158 gui_list->last_displayed_start_item[i] = -1 ;
159#ifdef HAVE_LCD_BITMAP 158#ifdef HAVE_LCD_BITMAP
160 gui_list->offset_position[i] = 0; 159 gui_list->offset_position[i] = 0;
161#endif 160#endif
@@ -170,12 +169,10 @@ void gui_synclist_init(struct gui_synclist * gui_list,
170 gui_list->scroll_all = scroll_all; 169 gui_list->scroll_all = scroll_all;
171 gui_list->selected_size = selected_size; 170 gui_list->selected_size = selected_size;
172 gui_list->title = NULL; 171 gui_list->title = NULL;
173 gui_list->title_width = 0;
174 gui_list->title_icon = Icon_NOICON; 172 gui_list->title_icon = Icon_NOICON;
175 173
176 gui_list->scheduled_talk_tick = gui_list->last_talked_tick = 0; 174 gui_list->scheduled_talk_tick = gui_list->last_talked_tick = 0;
177 gui_list->show_selection_marker = true; 175 gui_list->show_selection_marker = true;
178 gui_list->last_displayed_selected_item = -1;
179 176
180#ifdef HAVE_LCD_COLOR 177#ifdef HAVE_LCD_COLOR
181 gui_list->title_color = -1; 178 gui_list->title_color = -1;
@@ -402,20 +399,6 @@ void gui_synclist_set_title(struct gui_synclist * gui_list,
402{ 399{
403 gui_list->title = title; 400 gui_list->title = title;
404 gui_list->title_icon = icon; 401 gui_list->title_icon = icon;
405 if (title)
406 {
407#ifdef HAVE_LCD_BITMAP
408 int i;
409 FOR_NB_SCREENS(i)
410 screens[i].getstringsize(title, &gui_list->title_width, NULL);
411#else
412 gui_list->title_width = strlen(title);
413#endif
414 }
415 else
416 {
417 gui_list->title_width = 0;
418 }
419} 402}
420 403
421void gui_synclist_set_nb_items(struct gui_synclist * lists, int nb_items) 404void gui_synclist_set_nb_items(struct gui_synclist * lists, int nb_items)
diff --git a/apps/gui/list.h b/apps/gui/list.h
index 92495d7408..965a46bfc6 100644
--- a/apps/gui/list.h
+++ b/apps/gui/list.h
@@ -100,15 +100,9 @@ struct gui_synclist
100 int start_item[NB_SCREENS]; /* the item that is displayed at the top of the screen */ 100 int start_item[NB_SCREENS]; /* the item that is displayed at the top of the screen */
101 /* the number of lines that are selected at the same time */ 101 /* the number of lines that are selected at the same time */
102 int selected_size; 102 int selected_size;
103 /* These are used to calculate how much of the screen content we need
104 to redraw. */
105 int last_displayed_selected_item;
106 int last_displayed_start_item[NB_SCREENS];
107#ifdef HAVE_LCD_BITMAP 103#ifdef HAVE_LCD_BITMAP
108 int offset_position[NB_SCREENS]; /* the list's screen scroll placement in pixels */ 104 int offset_position[NB_SCREENS]; /* the list's screen scroll placement in pixels */
109#endif 105#endif
110 /* Cache the width of the title string in pixels/characters */
111 int title_width;
112 long scheduled_talk_tick, last_talked_tick; 106 long scheduled_talk_tick, last_talked_tick;
113 107
114 list_get_icon *callback_get_item_icon; 108 list_get_icon *callback_get_item_icon;