diff options
-rw-r--r-- | apps/gui/list.c | 2 | ||||
-rw-r--r-- | apps/gui/list.h | 1 | ||||
-rw-r--r-- | apps/menus/display_menu.c | 17 | ||||
-rw-r--r-- | apps/menus/theme_menu.c | 16 |
4 files changed, 5 insertions, 31 deletions
diff --git a/apps/gui/list.c b/apps/gui/list.c index d15948e97a..83d12289f2 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c | |||
@@ -123,7 +123,7 @@ void list_init_item_height(struct gui_synclist *list, enum screen_type screen) | |||
123 | #endif | 123 | #endif |
124 | } | 124 | } |
125 | 125 | ||
126 | void gui_synclist_init_display_settings(struct gui_synclist * list) | 126 | static void gui_synclist_init_display_settings(struct gui_synclist * list) |
127 | { | 127 | { |
128 | struct user_settings *gs = &global_settings; | 128 | struct user_settings *gs = &global_settings; |
129 | list->scrollbar = gs->scrollbar; | 129 | list->scrollbar = gs->scrollbar; |
diff --git a/apps/gui/list.h b/apps/gui/list.h index 15ee1df736..40a27d1061 100644 --- a/apps/gui/list.h +++ b/apps/gui/list.h | |||
@@ -190,7 +190,6 @@ struct gui_synclist | |||
190 | 190 | ||
191 | extern void list_init(void); | 191 | extern void list_init(void); |
192 | 192 | ||
193 | extern void gui_synclist_init_display_settings(struct gui_synclist * list); | ||
194 | extern void gui_synclist_init( | 193 | extern void gui_synclist_init( |
195 | struct gui_synclist * lists, | 194 | struct gui_synclist * lists, |
196 | list_get_name callback_get_item_name, | 195 | list_get_name callback_get_item_name, |
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index b228095bb3..d7993fdbda 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c | |||
@@ -335,22 +335,7 @@ MENUITEM_SETTING(list_accel_wait, &global_settings.list_accel_wait, NULL); | |||
335 | MENUITEM_SETTING(offset_out_of_view, &global_settings.offset_out_of_view, NULL); | 335 | MENUITEM_SETTING(offset_out_of_view, &global_settings.offset_out_of_view, NULL); |
336 | MENUITEM_SETTING(screen_scroll_step, &global_settings.screen_scroll_step, NULL); | 336 | MENUITEM_SETTING(screen_scroll_step, &global_settings.screen_scroll_step, NULL); |
337 | MENUITEM_SETTING(scroll_paginated, &global_settings.scroll_paginated, NULL); | 337 | MENUITEM_SETTING(scroll_paginated, &global_settings.scroll_paginated, NULL); |
338 | 338 | MENUITEM_SETTING(list_wraparound, &global_settings.list_wraparound, NULL); | |
339 | static int listwraparound_callback(int action, | ||
340 | const struct menu_item_ex *this_item, | ||
341 | struct gui_synclist *this_list) | ||
342 | { | ||
343 | (void)this_item; | ||
344 | switch (action) | ||
345 | { | ||
346 | case ACTION_EXIT_MENUITEM: | ||
347 | gui_synclist_init_display_settings(this_list); | ||
348 | break; | ||
349 | } | ||
350 | return action; | ||
351 | } | ||
352 | |||
353 | MENUITEM_SETTING(list_wraparound, &global_settings.list_wraparound, listwraparound_callback); | ||
354 | MENUITEM_SETTING(list_order, &global_settings.list_order, NULL); | 339 | MENUITEM_SETTING(list_order, &global_settings.list_order, NULL); |
355 | 340 | ||
356 | MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, Icon_NOICON, | 341 | MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, Icon_NOICON, |
diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c index 61a6937e3c..9c7a174f7f 100644 --- a/apps/menus/theme_menu.c +++ b/apps/menus/theme_menu.c | |||
@@ -165,16 +165,6 @@ MAKE_MENU(colors_settings, ID2P(LANG_COLORS_MENU), | |||
165 | /* BARS MENU */ | 165 | /* BARS MENU */ |
166 | /* */ | 166 | /* */ |
167 | 167 | ||
168 | static int list_update_callback(int action, | ||
169 | const struct menu_item_ex *this_item, | ||
170 | struct gui_synclist *this_list) | ||
171 | { | ||
172 | (void)this_item; | ||
173 | if (action == ACTION_EXIT_MENUITEM) | ||
174 | gui_synclist_init_display_settings(this_list); | ||
175 | return ACTION_REDRAW; | ||
176 | } | ||
177 | |||
178 | static int statusbar_callback_ex(int action,const struct menu_item_ex *this_item, | 168 | static int statusbar_callback_ex(int action,const struct menu_item_ex *this_item, |
179 | enum screen_type screen) | 169 | enum screen_type screen) |
180 | { | 170 | { |
@@ -213,7 +203,7 @@ static int statusbar_callback(int action, | |||
213 | return statusbar_callback_ex(action, this_item, SCREEN_MAIN); | 203 | return statusbar_callback_ex(action, this_item, SCREEN_MAIN); |
214 | } | 204 | } |
215 | 205 | ||
216 | MENUITEM_SETTING(scrollbar_item, &global_settings.scrollbar, list_update_callback); | 206 | MENUITEM_SETTING(scrollbar_item, &global_settings.scrollbar, NULL); |
217 | MENUITEM_SETTING(scrollbar_width, &global_settings.scrollbar_width, NULL); | 207 | MENUITEM_SETTING(scrollbar_width, &global_settings.scrollbar_width, NULL); |
218 | MENUITEM_SETTING(statusbar, &global_settings.statusbar, statusbar_callback); | 208 | MENUITEM_SETTING(statusbar, &global_settings.statusbar, statusbar_callback); |
219 | #ifdef HAVE_REMOTE_LCD | 209 | #ifdef HAVE_REMOTE_LCD |
@@ -367,6 +357,7 @@ static int showicons_callback(int action, | |||
367 | struct gui_synclist *this_list) | 357 | struct gui_synclist *this_list) |
368 | { | 358 | { |
369 | (void)this_item; | 359 | (void)this_item; |
360 | (void)this_list; | ||
370 | static bool old_icons; | 361 | static bool old_icons; |
371 | switch (action) | 362 | switch (action) |
372 | { | 363 | { |
@@ -376,7 +367,6 @@ static int showicons_callback(int action, | |||
376 | case ACTION_EXIT_MENUITEM: | 367 | case ACTION_EXIT_MENUITEM: |
377 | if (old_icons != global_settings.show_icons) | 368 | if (old_icons != global_settings.show_icons) |
378 | icons_init(); | 369 | icons_init(); |
379 | gui_synclist_init_display_settings(this_list); | ||
380 | break; | 370 | break; |
381 | } | 371 | } |
382 | return ACTION_REDRAW; | 372 | return ACTION_REDRAW; |
@@ -386,7 +376,7 @@ MENUITEM_SETTING(show_icons, &global_settings.show_icons, showicons_callback); | |||
386 | MENUITEM_FUNCTION(browse_themes, MENU_FUNC_USEPARAM, | 376 | MENUITEM_FUNCTION(browse_themes, MENU_FUNC_USEPARAM, |
387 | ID2P(LANG_CUSTOM_THEME), | 377 | ID2P(LANG_CUSTOM_THEME), |
388 | browse_folder, (void*)&themes, NULL, Icon_Config); | 378 | browse_folder, (void*)&themes, NULL, Icon_Config); |
389 | MENUITEM_SETTING(cursor_style, &global_settings.cursor_style, list_update_callback); | 379 | MENUITEM_SETTING(cursor_style, &global_settings.cursor_style, NULL); |
390 | #if LCD_DEPTH > 1 | 380 | #if LCD_DEPTH > 1 |
391 | MENUITEM_SETTING(sep_menu, &global_settings.list_separator_height, NULL); | 381 | MENUITEM_SETTING(sep_menu, &global_settings.list_separator_height, NULL); |
392 | #endif | 382 | #endif |