mika/nx-hbmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved not-color settings to the proper place

Browse Source
This commit is contained in:
friedkeenan 2018-09-09 23:42:04 -05:00 committed by GitHub
parent a3ee372649
commit ca6a2ad810
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/theme.c
View File

@ -71,6 +71,12 @@ void themeStartup(ThemePreset preset) {
highlight = themeLight.highlightColor; highlight = themeLight.highlightColor;
if (!colorFromSetting(config_lookup(cfg, "lightTheme.separatorColor"), &separator)) if (!colorFromSetting(config_lookup(cfg, "lightTheme.separatorColor"), &separator))
separator = themeLight.separatorColor; separator = themeLight.separatorColor;
if (!config_setting_lookup_int(theme, "enableWaveBlending", &waveBlending))
waveBlending = themeLight.enableWaveBlending;
if (!config_setting_lookup_string(theme, "buttonAText", &AText))
AText = themeLight.buttonAText;
if (!config_setting_lookup_string(theme, "buttonBText", &BText))
BText = themeLight.buttonBText;
} else { } else {
themeCurrent=themeLight; themeCurrent=themeLight;
} }
@ -97,6 +103,12 @@ void themeStartup(ThemePreset preset) {
highlight = themeDark.highlightColor; highlight = themeDark.highlightColor;
if (!colorFromSetting(config_lookup(cfg, "darkTheme.separatorColor"), &separator)) if (!colorFromSetting(config_lookup(cfg, "darkTheme.separatorColor"), &separator))
separator = themeDark.separatorColor; separator = themeDark.separatorColor;
if (!config_setting_lookup_int(theme, "enableWaveBlending", &waveBlending))
waveBlending = themeDark.enableWaveBlending;
if (!config_setting_lookup_string(theme, "buttonAText", &AText))
AText = themeDark.buttonAText;
if (!config_setting_lookup_string(theme, "buttonBText", &BText))
BText = themeDark.buttonBText;
} else { } else {
themeCurrent=themeDark; themeCurrent=themeDark;
} }
@ -105,13 +117,7 @@ void themeStartup(ThemePreset preset) {
} }
break; break;
} }
if (good_cfg){ if (good_cfg)
if (!config_setting_lookup_int(theme, "enableWaveBlending", &waveBlending))
waveBlending = themeLight.enableWaveBlending;
if (!config_setting_lookup_string(theme, "buttonAText", &AText))
AText = themeLight.buttonAText;
if (!config_setting_lookup_string(theme, "buttonBText", &BText))
BText = themeDark.buttonBText;
themeCurrent = (theme_t) { themeCurrent = (theme_t) {
.textColor = text, .textColor = text,
.frontWaveColor = frontWave, .frontWaveColor = frontWave,
@ -127,5 +133,4 @@ void themeStartup(ThemePreset preset) {
//.buttonBImage = button_b_dark_bin, //.buttonBImage = button_b_dark_bin,
.hbmenuLogoImage = hbmenu_logo_dark_bin .hbmenuLogoImage = hbmenu_logo_dark_bin
}; };
}
} }