Use secondary color for Toggle buttons in HASP theme

This commit is contained in:
fvanroie 2023-02-16 04:28:55 +01:00
parent 46e9e97132
commit 87768f3040
2 changed files with 5 additions and 5 deletions

View File

@ -838,7 +838,7 @@ bool haspSetConfig(const JsonObject& settings)
theme_changed |= configSet(haspThemeId, settings[FPSTR(FP_CONFIG_THEME)], F("haspThemeId"));
theme_changed |= configSet(haspThemeHue, settings[FPSTR(FP_CONFIG_HUE)], F("haspThemeHue"));
color_primary = lv_color_hsv_to_rgb(haspThemeHue, 100, 100);
color_secondary = lv_color_hsv_to_rgb(haspThemeHue, 100, 100);
color_secondary = lv_color_hsv_to_rgb(20, 60, 100);
// Check for color1 and color2
theme_changed |= configSet(color_primary, settings[FPSTR(FP_CONFIG_COLOR1)], F("haspColor1"));

View File

@ -36,10 +36,10 @@
/*BUTTON*/
#define COLOR_BTN (lv_color_lighten(HUE_COLOR, LV_OPA_30))
#define COLOR_BTN_GRAD (lv_color_darken(HUE_COLOR, LV_OPA_30))
#define COLOR_BTN_PR (lv_color_darken(COLOR_BTN, LV_OPA_20))
#define COLOR_BTN_PR_GRAD lv_color_darken(COLOR_BTN_GRAD, LV_OPA_20)
#define COLOR_BTN_CHK (lv_color_lighten(CHK_COLOR, LV_OPA_30))
#define COLOR_BTN_CHK_GRAD (lv_color_darken(CHK_COLOR, LV_OPA_30))
#define COLOR_BTN_PR (lv_color_lighten(HUE_COLOR, LV_OPA_10))
#define COLOR_BTN_PR_GRAD lv_color_darken(HUE_COLOR, LV_OPA_50)
#define COLOR_BTN_CHK (lv_color_lighten(CHK_COLOR, LV_OPA_0))
#define COLOR_BTN_CHK_GRAD (lv_color_darken(CHK_COLOR, LV_OPA_60))
#define COLOR_BTN_CHK_PR (lv_color_darken(COLOR_BTN_CHK, LV_OPA_20))
#define COLOR_BTN_CHK_PR_GRAD (lv_color_darken(COLOR_BTN_CHK_GRAD, LV_OPA_20))
#define COLOR_BTN_DIS (IS_LIGHT ? lv_color_hex3(0xccc) : lv_color_hex3(0x888))