(RGUI) Add 'Gray Dark + Light' themes

This commit is contained in:
sonninnos 2022-03-22 15:42:00 +02:00 committed by Autechre
parent d7983f2827
commit 8fc14354e9
5 changed files with 80 additions and 0 deletions

View File

@ -9310,6 +9310,14 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_MENU_COLOR_THEME_DYNAMIC,
"Dynamic"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_MENU_COLOR_THEME_GRAY_DARK,
"Gray Dark"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_MENU_COLOR_THEME_GRAY_LIGHT,
"Gray Light"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_PARTICLE_EFFECT_NONE,
"OFF"

View File

@ -924,6 +924,54 @@ static const rgui_theme_t rgui_theme_opaque_flux = {
0xFFEE2000 /* particle_color */
};
static const rgui_theme_t rgui_theme_gray_dark = {
0xFFFFFFFF, /* hover_color */
0xFF808080, /* normal_color */
0xFFFFFFFF, /* title_color */
0xE0101010, /* bg_dark_color */
0xE0101010, /* bg_light_color */
0xE0303030, /* border_dark_color */
0xE0303030, /* border_light_color */
0xFF000000, /* shadow_color */
0xE0202020 /* particle_color */
};
static const rgui_theme_t rgui_theme_opaque_gray_dark = {
0xFFFFFFFF, /* hover_color */
0xFF808080, /* normal_color */
0xFFFFFFFF, /* title_color */
0xFF101010, /* bg_dark_color */
0xFF101010, /* bg_light_color */
0xFF303030, /* border_dark_color */
0xFF303030, /* border_light_color */
0xFF000000, /* shadow_color */
0xE0202020 /* particle_color */
};
static const rgui_theme_t rgui_theme_gray_light = {
0xFFFFFFFF, /* hover_color */
0xFF808080, /* normal_color */
0xFFFFFFFF, /* title_color */
0xE0303030, /* bg_dark_color */
0xE0303030, /* bg_light_color */
0xE0101010, /* border_dark_color */
0xE0101010, /* border_light_color */
0xFF000000, /* shadow_color */
0xE0202020 /* particle_color */
};
static const rgui_theme_t rgui_theme_opaque_gray_light = {
0xFFFFFFFF, /* hover_color */
0xFF808080, /* normal_color */
0xFFFFFFFF, /* title_color */
0xFF303030, /* bg_dark_color */
0xFF303030, /* bg_light_color */
0xFF101010, /* border_dark_color */
0xFF101010, /* border_light_color */
0xFF000000, /* shadow_color */
0xE0202020 /* particle_color */
};
typedef struct
{
uint16_t hover_color;
@ -3005,6 +3053,14 @@ static const rgui_theme_t *get_theme(rgui_t *rgui)
return transparent ?
&rgui_theme_flux :
&rgui_theme_opaque_flux;
case RGUI_THEME_GRAY_DARK:
return transparent ?
&rgui_theme_gray_dark :
&rgui_theme_opaque_gray_dark;
case RGUI_THEME_GRAY_LIGHT:
return transparent ?
&rgui_theme_gray_light :
&rgui_theme_opaque_gray_light;
default:
break;
}

View File

@ -178,6 +178,8 @@ enum rgui_color_theme
RGUI_THEME_ANTI_ZENBURN,
RGUI_THEME_FLUX,
RGUI_THEME_DYNAMIC,
RGUI_THEME_GRAY_DARK,
RGUI_THEME_GRAY_LIGHT,
RGUI_THEME_LAST
};

View File

@ -3929,6 +3929,18 @@ static void setting_get_string_representation_uint_rgui_menu_color_theme(
MENU_ENUM_LABEL_VALUE_RGUI_MENU_COLOR_THEME_DYNAMIC),
len);
break;
case RGUI_THEME_GRAY_DARK:
strlcpy(s,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_RGUI_MENU_COLOR_THEME_GRAY_DARK),
len);
break;
case RGUI_THEME_GRAY_LIGHT:
strlcpy(s,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_RGUI_MENU_COLOR_THEME_GRAY_LIGHT),
len);
break;
}
}

View File

@ -618,6 +618,8 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_RGUI_MENU_COLOR_THEME_ANTI_ZENBURN,
MENU_ENUM_LABEL_VALUE_RGUI_MENU_COLOR_THEME_FLUX,
MENU_ENUM_LABEL_VALUE_RGUI_MENU_COLOR_THEME_DYNAMIC,
MENU_ENUM_LABEL_VALUE_RGUI_MENU_COLOR_THEME_GRAY_DARK,
MENU_ENUM_LABEL_VALUE_RGUI_MENU_COLOR_THEME_GRAY_LIGHT,
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_WHITE,
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_BLACK,