summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Soffke <christian.soffke@gmail.com>2021-03-02 00:46:09 +0100
committerSolomon Peachy <pizza@shaftnet.org>2021-03-09 11:18:47 +0000
commit5c3bbc6a9c9954778002e379799c701d4900b29e (patch)
treecb391e3c51e5d0624dc1a4036136e8dc161c1f1b
parent3b9a803a5b4f1e94339e7bb9724400a096900306 (diff)
downloadrockbox-5c3bbc6a9c9954778002e379799c701d4900b29e.tar.gz
rockbox-5c3bbc6a9c9954778002e379799c701d4900b29e.zip
Reset filetype colors when resetting theme colors
Even though filetype colors can't currently be changed by going to Settings->Theme Settings->Colors, a user likely wishes to still reset them when selecting 'Reset Colors' after a .colours file may have been applied by a theme. Change-Id: I4494c83a502666900f6d9d2cc3fb1825af5e45f6
-rw-r--r--apps/menus/theme_menu.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c
index a160d4c298..4a81c5cadf 100644
--- a/apps/menus/theme_menu.c
+++ b/apps/menus/theme_menu.c
@@ -42,6 +42,9 @@
42#include "statusbar-skinned.h" 42#include "statusbar-skinned.h"
43#include "skin_engine/skin_engine.h" 43#include "skin_engine/skin_engine.h"
44#include "icons.h" 44#include "icons.h"
45#ifdef HAVE_LCD_COLOR
46#include "filetypes.h"
47#endif
45 48
46#ifdef HAVE_BACKDROP_IMAGE 49#ifdef HAVE_BACKDROP_IMAGE
47/** 50/**
@@ -116,7 +119,10 @@ static int reset_color(void)
116 global_settings.lse_color = LCD_DEFAULT_BG; 119 global_settings.lse_color = LCD_DEFAULT_BG;
117 global_settings.lst_color = LCD_DEFAULT_FG; 120 global_settings.lst_color = LCD_DEFAULT_FG;
118 global_settings.list_separator_color = LCD_DARKGRAY; 121 global_settings.list_separator_color = LCD_DARKGRAY;
119 122 global_settings.colors_file[0] = '-';
123 global_settings.colors_file[1] = '\0';
124
125 read_color_theme_file();
120 settings_save(); 126 settings_save();
121 settings_apply(false); 127 settings_apply(false);
122 settings_apply_skins(); 128 settings_apply_skins();