From dafcd1470acaced405fa1a67d008aa1b68d1b6dd Mon Sep 17 00:00:00 2001 From: Teruaki Kawashima Date: Sun, 21 Feb 2010 13:32:52 +0000 Subject: remove unused fields from struct gui_synclist. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24807 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/charcell/list.c | 4 ---- apps/gui/list.c | 17 ----------------- apps/gui/list.h | 6 ------ 3 files changed, 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) display->clear_display(); start = 0; end = display->getnblines(); - gui_list->last_displayed_start_item[display->screen_type] = - gui_list->start_item[display->screen_type]; - - gui_list->last_displayed_selected_item = gui_list->selected_item; /* Adjust the position of icon, cursor, text for the list */ 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, FOR_NB_SCREENS(i) { gui_list->start_item[i] = 0; - gui_list->last_displayed_start_item[i] = -1 ; #ifdef HAVE_LCD_BITMAP gui_list->offset_position[i] = 0; #endif @@ -170,12 +169,10 @@ void gui_synclist_init(struct gui_synclist * gui_list, gui_list->scroll_all = scroll_all; gui_list->selected_size = selected_size; gui_list->title = NULL; - gui_list->title_width = 0; gui_list->title_icon = Icon_NOICON; gui_list->scheduled_talk_tick = gui_list->last_talked_tick = 0; gui_list->show_selection_marker = true; - gui_list->last_displayed_selected_item = -1; #ifdef HAVE_LCD_COLOR gui_list->title_color = -1; @@ -402,20 +399,6 @@ void gui_synclist_set_title(struct gui_synclist * gui_list, { gui_list->title = title; gui_list->title_icon = icon; - if (title) - { -#ifdef HAVE_LCD_BITMAP - int i; - FOR_NB_SCREENS(i) - screens[i].getstringsize(title, &gui_list->title_width, NULL); -#else - gui_list->title_width = strlen(title); -#endif - } - else - { - gui_list->title_width = 0; - } } void 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 int start_item[NB_SCREENS]; /* the item that is displayed at the top of the screen */ /* the number of lines that are selected at the same time */ int selected_size; - /* These are used to calculate how much of the screen content we need - to redraw. */ - int last_displayed_selected_item; - int last_displayed_start_item[NB_SCREENS]; #ifdef HAVE_LCD_BITMAP int offset_position[NB_SCREENS]; /* the list's screen scroll placement in pixels */ #endif - /* Cache the width of the title string in pixels/characters */ - int title_width; long scheduled_talk_tick, last_talked_tick; list_get_icon *callback_get_item_icon; -- cgit v1.2.3