diff options
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/list.c | 7 | ||||
-rw-r--r-- | apps/gui/list.h | 2 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_display.c | 33 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_engine.h | 3 |
4 files changed, 0 insertions, 45 deletions
diff --git a/apps/gui/list.c b/apps/gui/list.c index 4f1d3833d6..c53a1f559c 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c | |||
@@ -778,13 +778,6 @@ bool list_do_action(int context, int timeout, | |||
778 | return gui_synclist_do_button(lists, action, wrap); | 778 | return gui_synclist_do_button(lists, action, wrap); |
779 | } | 779 | } |
780 | 780 | ||
781 | bool gui_synclist_item_is_onscreen(struct gui_synclist *lists, | ||
782 | enum screen_type screen, int item) | ||
783 | { | ||
784 | int nb_lines = list_get_nb_lines(lists, screen); | ||
785 | return (unsigned)(item - lists->start_item[screen]) < (unsigned) nb_lines; | ||
786 | } | ||
787 | |||
788 | /* Simple use list implementation */ | 781 | /* Simple use list implementation */ |
789 | static int simplelist_line_count = 0; | 782 | static int simplelist_line_count = 0; |
790 | static char simplelist_text[SIMPLELIST_MAX_LINES][SIMPLELIST_MAX_LINELENGTH]; | 783 | static char simplelist_text[SIMPLELIST_MAX_LINES][SIMPLELIST_MAX_LINELENGTH]; |
diff --git a/apps/gui/list.h b/apps/gui/list.h index 1a713daa36..c53604659e 100644 --- a/apps/gui/list.h +++ b/apps/gui/list.h | |||
@@ -165,8 +165,6 @@ extern void gui_synclist_set_title(struct gui_synclist * lists, char * title, | |||
165 | enum themable_icons icon); | 165 | enum themable_icons icon); |
166 | extern void gui_synclist_hide_selection_marker(struct gui_synclist *lists, | 166 | extern void gui_synclist_hide_selection_marker(struct gui_synclist *lists, |
167 | bool hide); | 167 | bool hide); |
168 | extern bool gui_synclist_item_is_onscreen(struct gui_synclist *lists, | ||
169 | enum screen_type screen, int item); | ||
170 | /* | 168 | /* |
171 | * Do the action implied by the given button, | 169 | * Do the action implied by the given button, |
172 | * returns true if the action was handled. | 170 | * returns true if the action was handled. |
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c index 206da9d9df..0613f986b3 100644 --- a/apps/gui/skin_engine/skin_display.c +++ b/apps/gui/skin_engine/skin_display.c | |||
@@ -95,39 +95,6 @@ void skin_update(enum skinnable_screens skin, enum screen_type screen, | |||
95 | 95 | ||
96 | #ifdef HAVE_LCD_BITMAP | 96 | #ifdef HAVE_LCD_BITMAP |
97 | 97 | ||
98 | void skin_statusbar_changed(struct gui_wps *skin) | ||
99 | { | ||
100 | if (!skin) | ||
101 | return; | ||
102 | struct wps_data *data = skin->data; | ||
103 | const struct screen *display = skin->display; | ||
104 | const int screen = display->screen_type; | ||
105 | struct skin_viewport *svp = skin_find_item(VP_DEFAULT_LABEL_STRING, SKIN_FIND_VP, data); | ||
106 | |||
107 | struct viewport *vp = &svp->vp; | ||
108 | viewport_set_defaults(vp, screen); | ||
109 | |||
110 | if (data->wps_sb_tag) | ||
111 | { /* fix up the default viewport */ | ||
112 | if (data->show_sb_on_wps) | ||
113 | { | ||
114 | if (statusbar_position(screen) != STATUSBAR_OFF) | ||
115 | return; /* vp is fixed already */ | ||
116 | |||
117 | vp->y = STATUSBAR_HEIGHT; | ||
118 | vp->height = display->lcdheight - STATUSBAR_HEIGHT; | ||
119 | } | ||
120 | else | ||
121 | { | ||
122 | if (statusbar_position(screen) == STATUSBAR_OFF) | ||
123 | return; /* vp is fixed already */ | ||
124 | vp->y = vp->x = 0; | ||
125 | vp->height = display->lcdheight; | ||
126 | vp->width = display->lcdwidth; | ||
127 | } | ||
128 | } | ||
129 | } | ||
130 | |||
131 | void draw_progressbar(struct gui_wps *gwps, int line, struct progressbar *pb) | 98 | void draw_progressbar(struct gui_wps *gwps, int line, struct progressbar *pb) |
132 | { | 99 | { |
133 | struct screen *display = gwps->display; | 100 | struct screen *display = gwps->display; |
diff --git a/apps/gui/skin_engine/skin_engine.h b/apps/gui/skin_engine/skin_engine.h index 7a41063af9..ac839fff2e 100644 --- a/apps/gui/skin_engine/skin_engine.h +++ b/apps/gui/skin_engine/skin_engine.h | |||
@@ -57,9 +57,6 @@ void skin_update(enum skinnable_screens skin, enum screen_type screen, | |||
57 | bool skin_data_load(enum screen_type screen, struct wps_data *wps_data, | 57 | bool skin_data_load(enum screen_type screen, struct wps_data *wps_data, |
58 | const char *buf, bool isfile); | 58 | const char *buf, bool isfile); |
59 | 59 | ||
60 | /* call this in statusbar toggle handlers if needed */ | ||
61 | void skin_statusbar_changed(struct gui_wps*); | ||
62 | |||
63 | bool skin_has_sbs(enum screen_type screen, struct wps_data *data); | 60 | bool skin_has_sbs(enum screen_type screen, struct wps_data *data); |
64 | 61 | ||
65 | 62 | ||