diff options
-rw-r--r-- | apps/gui/list.h | 3 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_engine.h | 8 | ||||
-rw-r--r-- | firmware/drivers/lcd-bitmap-common.c | 1 | ||||
-rw-r--r-- | firmware/export/scroll_engine.h | 2 |
4 files changed, 3 insertions, 11 deletions
diff --git a/apps/gui/list.h b/apps/gui/list.h index 1d4a6bd5b4..92495d7408 100644 --- a/apps/gui/list.h +++ b/apps/gui/list.h | |||
@@ -166,7 +166,6 @@ extern void gui_synclist_select_item(struct gui_synclist * lists, | |||
166 | extern void gui_synclist_add_item(struct gui_synclist * lists); | 166 | extern void gui_synclist_add_item(struct gui_synclist * lists); |
167 | extern void gui_synclist_del_item(struct gui_synclist * lists); | 167 | extern void gui_synclist_del_item(struct gui_synclist * lists); |
168 | extern void gui_synclist_limit_scroll(struct gui_synclist * lists, bool scroll); | 168 | extern void gui_synclist_limit_scroll(struct gui_synclist * lists, bool scroll); |
169 | extern void gui_synclist_flash(struct gui_synclist * lists); | ||
170 | extern void gui_synclist_set_title(struct gui_synclist * lists, char * title, | 169 | extern void gui_synclist_set_title(struct gui_synclist * lists, char * title, |
171 | enum themable_icons icon); | 170 | enum themable_icons icon); |
172 | extern void gui_synclist_hide_selection_marker(struct gui_synclist *lists, | 171 | extern void gui_synclist_hide_selection_marker(struct gui_synclist *lists, |
@@ -256,7 +255,7 @@ void simplelist_addline(int line_number, const char *fmt, ...); | |||
256 | */ | 255 | */ |
257 | void simplelist_info_init(struct simplelist_info *info, char* title, | 256 | void simplelist_info_init(struct simplelist_info *info, char* title, |
258 | int count, void* data); | 257 | int count, void* data); |
259 | 258 | ||
260 | /* show a list. | 259 | /* show a list. |
261 | if list->action_callback != NULL it is called with the action ACTION_REDRAW | 260 | if list->action_callback != NULL it is called with the action ACTION_REDRAW |
262 | before the list is dislplayed for the first time */ | 261 | before the list is dislplayed for the first time */ |
diff --git a/apps/gui/skin_engine/skin_engine.h b/apps/gui/skin_engine/skin_engine.h index 642f15aaad..90f38c9920 100644 --- a/apps/gui/skin_engine/skin_engine.h +++ b/apps/gui/skin_engine/skin_engine.h | |||
@@ -40,10 +40,6 @@ enum skinnable_screens { | |||
40 | int wps_get_touchaction(struct wps_data *data); | 40 | int wps_get_touchaction(struct wps_data *data); |
41 | #endif | 41 | #endif |
42 | 42 | ||
43 | /* setup and display a WPS for the first time */ | ||
44 | bool gui_wps_display(struct gui_wps *gwps); | ||
45 | |||
46 | |||
47 | /* Do a update_type update of the skinned screen */ | 43 | /* Do a update_type update of the skinned screen */ |
48 | bool skin_update(struct gui_wps *gwps, unsigned int update_type); | 44 | bool skin_update(struct gui_wps *gwps, unsigned int update_type); |
49 | 45 | ||
@@ -54,10 +50,6 @@ bool skin_update(struct gui_wps *gwps, unsigned int update_type); | |||
54 | bool skin_data_load(enum screen_type screen, struct wps_data *wps_data, | 50 | bool skin_data_load(enum screen_type screen, struct wps_data *wps_data, |
55 | const char *buf, bool isfile); | 51 | const char *buf, bool isfile); |
56 | 52 | ||
57 | |||
58 | /* initial setup of wps_data */ | ||
59 | void skin_data_init(struct wps_data *wps_data); | ||
60 | |||
61 | /* call this in statusbar toggle handlers if needed */ | 53 | /* call this in statusbar toggle handlers if needed */ |
62 | void skin_statusbar_changed(struct gui_wps*); | 54 | void skin_statusbar_changed(struct gui_wps*); |
63 | 55 | ||
diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c index 586c74578f..8f0b61ef6a 100644 --- a/firmware/drivers/lcd-bitmap-common.c +++ b/firmware/drivers/lcd-bitmap-common.c | |||
@@ -367,7 +367,6 @@ void LCDFN(puts_scroll_style_offset)(int x, int y, const unsigned char *string, | |||
367 | 367 | ||
368 | s->vp = current_vp; | 368 | s->vp = current_vp; |
369 | s->y = y; | 369 | s->y = y; |
370 | s->len = utf8length(string); | ||
371 | s->offset = offset; | 370 | s->offset = offset; |
372 | s->startx = x * LCDFN(getstringsize)(" ", NULL, NULL); | 371 | s->startx = x * LCDFN(getstringsize)(" ", NULL, NULL); |
373 | s->backward = false; | 372 | s->backward = false; |
diff --git a/firmware/export/scroll_engine.h b/firmware/export/scroll_engine.h index 0fcb06af81..16b11c22ee 100644 --- a/firmware/export/scroll_engine.h +++ b/firmware/export/scroll_engine.h | |||
@@ -50,7 +50,9 @@ struct scrollinfo | |||
50 | { | 50 | { |
51 | struct viewport* vp; | 51 | struct viewport* vp; |
52 | char line[SCROLL_LINE_SIZE]; | 52 | char line[SCROLL_LINE_SIZE]; |
53 | #ifdef HAVE_LCD_CHARCELLS | ||
53 | int len; /* length of line in chars */ | 54 | int len; /* length of line in chars */ |
55 | #endif | ||
54 | int y; /* Position of the line on the screen (char co-ordinates) */ | 56 | int y; /* Position of the line on the screen (char co-ordinates) */ |
55 | int offset; | 57 | int offset; |
56 | int startx; | 58 | int startx; |