diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 97244ed5235d..5505de0fcda3 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -12516,7 +12516,10 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SELENIUM, "Selenium" ) - +MSG_HASH( + MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BRIGHT, + "Bright" + ) /* MaterialUI: Settings > User Interface > Appearance */ diff --git a/menu/drivers/ozone.c b/menu/drivers/ozone.c index e732e36ff5a6..923ad35df9e9 100644 --- a/menu/drivers/ozone.c +++ b/menu/drivers/ozone.c @@ -659,6 +659,8 @@ static float ozone_sidebar_gradient_top_light[16] = { 0.922f, 0.922f, 0.922f, 1.00f, }; + + static float ozone_sidebar_gradient_bottom_light[16] = { 0.922f, 0.922f, 0.922f, 1.00f, 0.922f, 0.922f, 0.922f, 1.00f, @@ -666,6 +668,7 @@ static float ozone_sidebar_gradient_bottom_light[16] = { 0.94f, 0.94f, 0.94f, 1.00f, }; + static float ozone_sidebar_gradient_top_dark[16] = { 0.2f, 0.2f, 0.2f, 1.00f, 0.2f, 0.2f, 0.2f, 1.00f, @@ -805,6 +808,9 @@ static float ozone_sidebar_gradient_bottom_solarized_light[16] = { 1.0000000f, 1.0000000f, 0.9294118f, 1.0f, }; +static float ozone_sidebar_gradient_top_bright[16] = COLOR_HEX_TO_FLOAT(0xCCCCEE, 1.00f); +static float ozone_sidebar_gradient_bottom_bright[16] = COLOR_HEX_TO_FLOAT(0xCCCCEE, 1.00f); + static float ozone_sidebar_background_gray_dark[16] = COLOR_HEX_TO_FLOAT(0x101010, 0.0f); @@ -983,11 +989,16 @@ static float ozone_background_libretro_running_purple_rain[16] = { 0.0862745f, 0.0f, 0.1294117f, 1.0f, }; +static float ozone_background_libretro_running_bright[16] = COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.00f); + +static float ozone_sidebar_background_bright[16] = COLOR_HEX_TO_FLOAT(0xCCCCEE, 1.00f); + static float ozone_border_gray[16] = COLOR_HEX_TO_FLOAT(0x303030, 1.0f); static float ozone_border_0_light[16] = COLOR_HEX_TO_FLOAT(0x50EFD9, 1.00); static float ozone_border_1_light[16] = COLOR_HEX_TO_FLOAT(0x0DB6D5, 1.00); + static float ozone_border_0_dark[16] = COLOR_HEX_TO_FLOAT(0x198AC6, 1.00); static float ozone_border_1_dark[16] = COLOR_HEX_TO_FLOAT(0x89F1F2, 1.00); @@ -1021,6 +1032,9 @@ static float ozone_border_1_solarized_light[16] = COLOR_HEX_TO_FLOAT(0xDC322F static float ozone_border_0_purple_rain[16] = COLOR_HEX_TO_FLOAT(0xC3A0E0, 1.0f); static float ozone_border_1_purple_rain[16] = COLOR_HEX_TO_FLOAT(0x8C3DCC, 1.0f); +static float ozone_border_0_bright[16] = COLOR_HEX_TO_FLOAT(0x000000, 1.00); +static float ozone_border_1_bright[16] = COLOR_HEX_TO_FLOAT(0x000000, 1.00); + static ozone_theme_t ozone_theme_light = { COLOR_HEX_TO_FLOAT(0xEBEBEB, 1.00f), /* background */ ozone_background_libretro_running_light, /* background_libretro_running */ @@ -1547,6 +1561,38 @@ static ozone_theme_t ozone_theme_selenium = { NULL, /* name */ }; +static ozone_theme_t ozone_theme_bright = { + COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.00f), /* background */ + ozone_background_libretro_running_light, /* background_libretro_running */ + COLOR_HEX_TO_FLOAT(0x2B2B2B, 1.00f), /* header_footer_separator */ + COLOR_HEX_TO_FLOAT(0x111111, 1.00f), /* text */ + COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.00f), /* selection */ + COLOR_HEX_TO_FLOAT(0x00BBBB, 1.00f), /* selection_border */ + COLOR_HEX_TO_FLOAT(0xCDCDCD, 1.00f), /* entries_border */ + COLOR_HEX_TO_FLOAT(0x002266, 1.00f), /* entries_icon */ + COLOR_HEX_TO_FLOAT(0xAA3333, 1.00f), /* text_selected */ + COLOR_HEX_TO_FLOAT(0xF0F0F0, 1.00f), /* message_background */ + + 0x111111FF, /* text_rgba */ + 0x111111FF, /* text_sidebar_rgba */ + 0xCC2222FF, /* text_selected_rgba */ + 0x222222FF, /* text_sublabel_rgba */ + + /* Screensaver 'tint' (RGB24) */ + 0xEBEBEB, /* screensaver_tint */ + + ozone_sidebar_background_bright, /* sidebar_background */ + ozone_sidebar_gradient_top_bright, /* sidebar_top_gradient */ + ozone_sidebar_gradient_bottom_bright, /* sidebar_bottom_gradient */ + + ozone_border_0_bright, /* cursor_border_0 */ + ozone_border_1_bright, /* cursor_border_1 */ + + {0}, /* textures */ + + "bright" /* name */ +}; + static ozone_theme_t *ozone_themes[] = { &ozone_theme_light, &ozone_theme_dark, @@ -1562,6 +1608,7 @@ static ozone_theme_t *ozone_themes[] = { &ozone_theme_gray_light, &ozone_theme_purple_rain, &ozone_theme_selenium, + &ozone_theme_bright }; /* TODO/FIXME - global variables referenced outside */ @@ -1700,6 +1747,9 @@ static void ozone_set_color_theme( case OZONE_COLOR_THEME_PURPLE_RAIN: theme = &ozone_theme_purple_rain; break; + case OZONE_COLOR_THEME_BRIGHT: + theme = &ozone_theme_bright; + break; default: break; } diff --git a/menu/menu_defines.h b/menu/menu_defines.h index 5bff359c2e95..589f9c5e3967 100644 --- a/menu/menu_defines.h +++ b/menu/menu_defines.h @@ -438,6 +438,7 @@ enum ozone_color_theme OZONE_COLOR_THEME_GRAY_LIGHT, OZONE_COLOR_THEME_PURPLE_RAIN, OZONE_COLOR_THEME_SELENIUM, + OZONE_COLOR_THEME_BRIGHT, OZONE_COLOR_THEME_LAST }; diff --git a/menu/menu_setting.c b/menu/menu_setting.c index b627bf10203f..b49e7fe145e3 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -4685,6 +4685,11 @@ static size_t setting_get_string_representation_uint_ozone_menu_color_theme( return strlcpy(s, msg_hash_to_str( MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_WHITE), len); + case OZONE_COLOR_THEME_BRIGHT: + return strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BRIGHT),len); + } } return 0; diff --git a/msg_hash.h b/msg_hash.h index 642b9886f6c8..dc02a264c827 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -735,6 +735,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_GRAY_LIGHT, MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_PURPLE_RAIN, MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SELENIUM, + MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BRIGHT, MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME, MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_INVERTED,