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

Added highlightGradientEdgeColor for theme config.

Browse Source
This commit is contained in:
yellows8 2020-01-03 11:47:49 -05:00
parent 9eda227d33
commit 981749cfb7
No known key found for this signature in database
GPG Key ID: 0AF90DA3F1E60E43
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/menu.c
View File

@ -228,7 +228,7 @@ static void drawEntry(menuEntry_s* me, int off_x, int is_active) {
if (is_active) { if (is_active) {
highlight_multiplier = fmax(0.0, fabs(fmod(menuTimer, 1.0) - 0.5) / 0.5); highlight_multiplier = fmax(0.0, fabs(fmod(menuTimer, 1.0) - 0.5) / 0.5);
border_color = MakeColor(themeCurrent.highlightColor.r + (255 - themeCurrent.highlightColor.r) * highlight_multiplier, themeCurrent.highlightColor.g + (255 - themeCurrent.highlightColor.g) * highlight_multiplier, themeCurrent.highlightColor.b + (255 - themeCurrent.highlightColor.b) * highlight_multiplier, 255); border_color = MakeColor(themeCurrent.highlightColor.r + (themeCurrent.highlightGradientEdgeColor.r - themeCurrent.highlightColor.r) * highlight_multiplier, themeCurrent.highlightColor.g + (themeCurrent.highlightGradientEdgeColor.g - themeCurrent.highlightColor.g) * highlight_multiplier, themeCurrent.highlightColor.b + (themeCurrent.highlightGradientEdgeColor.b - themeCurrent.highlightColor.b) * highlight_multiplier, 255);
border_start_x = start_x-6; border_start_x = start_x-6;
border_end_x = end_x+6; border_end_x = end_x+6;
border_start_y = start_y-5; border_start_y = start_y-5;

7
common/theme.c
View File

@ -97,6 +97,7 @@ void themeStartup(ThemePreset preset) {
.backWaveColor = MakeColor(154, 171, 255, 255), .backWaveColor = MakeColor(154, 171, 255, 255),
.backgroundColor = MakeColor(233, 236, 241, 255), .backgroundColor = MakeColor(233, 236, 241, 255),
.highlightColor = MakeColor(91, 237, 224, 255), .highlightColor = MakeColor(91, 237, 224, 255),
.highlightGradientEdgeColor = MakeColor(255,255,255,255),
.separatorColor = MakeColor(219, 218, 219, 255), .separatorColor = MakeColor(219, 218, 219, 255),
.borderColor = MakeColor(255,255,255,255), .borderColor = MakeColor(255,255,255,255),
.borderTextColor = MakeColor(64,64,64,255), .borderTextColor = MakeColor(64,64,64,255),
@ -121,6 +122,7 @@ void themeStartup(ThemePreset preset) {
.backWaveColor = MakeColor(73, 103, 169, 255), .backWaveColor = MakeColor(73, 103, 169, 255),
.backgroundColor = MakeColor(45, 45, 50, 255), .backgroundColor = MakeColor(45, 45, 50, 255),
.highlightColor = MakeColor(91, 237, 224, 255), .highlightColor = MakeColor(91, 237, 224, 255),
.highlightGradientEdgeColor = MakeColor(255,255,255,255),
.separatorColor = MakeColor(219, 218, 219, 255), .separatorColor = MakeColor(219, 218, 219, 255),
.borderColor = MakeColor(255,255,255,255), .borderColor = MakeColor(255,255,255,255),
.borderTextColor = MakeColor(64,64,64,255), .borderTextColor = MakeColor(64,64,64,255),
@ -416,7 +418,7 @@ void themeStartup(ThemePreset preset) {
config_t cfg = {0}; config_t cfg = {0};
config_init(&cfg); config_init(&cfg);
config_setting_t *theme = NULL, *layout = NULL, *assets = NULL; config_setting_t *theme = NULL, *layout = NULL, *assets = NULL;
color_t text, logoColor={0}, attentionText, frontWave, middleWave, backWave, background, highlight, separator, borderColor, borderTextColor, progressBarColor; color_t text, logoColor={0}, attentionText, frontWave, middleWave, backWave, background, highlight, highlightGradientEdgeColor, separator, borderColor, borderTextColor, progressBarColor;
int waveBlending; int waveBlending;
const char *AText, *BText, *XText, *YText, *PText, *MText, *starOnText, *starOffText; const char *AText, *BText, *XText, *YText, *PText, *MText, *starOnText, *starOffText;
bool logoColor_set = false; bool logoColor_set = false;
@ -475,6 +477,8 @@ void themeStartup(ThemePreset preset) {
background = themeDefault->backgroundColor; background = themeDefault->backgroundColor;
if (!colorFromSetting(config_setting_lookup(theme, "highlightColor"), &highlight)) if (!colorFromSetting(config_setting_lookup(theme, "highlightColor"), &highlight))
highlight = themeDefault->highlightColor; highlight = themeDefault->highlightColor;
if (!colorFromSetting(config_setting_lookup(theme, "highlightGradientEdgeColor"), &highlightGradientEdgeColor))
highlightGradientEdgeColor = themeDefault->highlightGradientEdgeColor;
if (!colorFromSetting(config_setting_lookup(theme, "separatorColor"), &separator)) if (!colorFromSetting(config_setting_lookup(theme, "separatorColor"), &separator))
separator = themeDefault->separatorColor; separator = themeDefault->separatorColor;
if (!colorFromSetting(config_setting_lookup(theme, "borderColor"), &borderColor)) if (!colorFromSetting(config_setting_lookup(theme, "borderColor"), &borderColor))
@ -510,6 +514,7 @@ void themeStartup(ThemePreset preset) {
.backWaveColor = backWave, .backWaveColor = backWave,
.backgroundColor = background, .backgroundColor = background,
.highlightColor = highlight, .highlightColor = highlight,
.highlightGradientEdgeColor = highlightGradientEdgeColor,
.separatorColor = separator, .separatorColor = separator,
.borderColor = borderColor, .borderColor = borderColor,
.borderTextColor = borderTextColor, .borderTextColor = borderTextColor,

1
common/theme.h
View File

@ -33,6 +33,7 @@ typedef struct
color_t backWaveColor; color_t backWaveColor;
color_t backgroundColor; color_t backgroundColor;
color_t highlightColor; color_t highlightColor;
color_t highlightGradientEdgeColor;
color_t separatorColor; color_t separatorColor;
color_t borderColor; color_t borderColor;
color_t borderTextColor; color_t borderTextColor;