diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index 44990a3f71..18f9ab41a4 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -2123,6 +2123,8 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) return "Ribbon"; case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_BLUE: return "Blue"; + case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_BLUE_GREY: + return "Blue Grey"; case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_RED: return "Red"; case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_YELLOW: diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index f20906d180..3d69a76a55 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -796,6 +796,11 @@ static void menu_action_setting_disp_set_label_materialui_menu_color_theme( msg_hash_to_str( MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_BLUE), len); break; + case MATERIALUI_THEME_BLUE_GREY: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_BLUE_GREY), len); + break; case MATERIALUI_THEME_GREEN: strlcpy(s, msg_hash_to_str( diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index b97a775f95..1db625e39f 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -796,6 +796,7 @@ static void mui_frame(void *data) float red_500[16] = {0}; float red_50[16] = {0}; float yellow_500[16] = {0}; + float blue_grey_500[16] = {0}; float yellow_200[16] = {0}; unsigned width = 0; unsigned height = 0; @@ -834,14 +835,15 @@ static void mui_frame(void *data) if (!mui) return; - hex32_to_rgba_normalized(0xFFEB3B, yellow_500, 1.00); - hex32_to_rgba_normalized(0xFFF59D, yellow_200, 0.90); - hex32_to_rgba_normalized(0xF44336, red_500, 1.00); - hex32_to_rgba_normalized(0xFFEBEE, red_50, 0.90); - hex32_to_rgba_normalized(0x2196F3, blue_500, 1.00); - hex32_to_rgba_normalized(0xE3F2FD, blue_50, 0.90); - hex32_to_rgba_normalized(0x4CAF50, green_500, 1.00); - hex32_to_rgba_normalized(0xE8F5E9, green_50, 0.90); + hex32_to_rgba_normalized(0xFFEB3B, yellow_500, 1.00); + hex32_to_rgba_normalized(0xFFF59D, yellow_200, 0.90); + hex32_to_rgba_normalized(0xF44336, red_500, 1.00); + hex32_to_rgba_normalized(0xFFEBEE, red_50, 0.90); + hex32_to_rgba_normalized(0x2196F3, blue_500, 1.00); + hex32_to_rgba_normalized(0xE3F2FD, blue_50, 0.90); + hex32_to_rgba_normalized(0x4CAF50, green_500, 1.00); + hex32_to_rgba_normalized(0x607D8B, blue_grey_500, 1.00); + hex32_to_rgba_normalized(0xCFD8DC, green_50, 0.90); clearcolor.r = 1.0f; clearcolor.g = 1.0f; @@ -852,6 +854,17 @@ static void mui_frame(void *data) { case MATERIALUI_THEME_BLUE: break; + case MATERIALUI_THEME_BLUE_GREY: + header_bg_color = blue_grey_500; + body_bg_color = white_transp_bg; + highlighted_entry_color = green_50; + footer_bg_color = white_bg; + active_tab_marker_color = blue_grey_500; + + font_normal_color = 0x212121ff; + font_hover_color = 0x212121ff; + font_header_color = 0xffffffff; + break; case MATERIALUI_THEME_GREEN: header_bg_color = green_500; body_bg_color = white_transp_bg; @@ -878,7 +891,6 @@ static void mui_frame(void *data) case MATERIALUI_THEME_YELLOW: header_bg_color = yellow_500; body_bg_color = white_transp_bg; - body_bg_color = white_transp_bg; highlighted_entry_color = yellow_200; footer_bg_color = white_bg; active_tab_marker_color = yellow_500; diff --git a/menu/menu_display.h b/menu/menu_display.h index fec61bd476..930b09b3c9 100644 --- a/menu/menu_display.h +++ b/menu/menu_display.h @@ -32,6 +32,7 @@ RETRO_BEGIN_DECLS enum materialui_color_theme { MATERIALUI_THEME_BLUE = 0, + MATERIALUI_THEME_BLUE_GREY, MATERIALUI_THEME_GREEN, MATERIALUI_THEME_RED, MATERIALUI_THEME_YELLOW, diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 2f971f6020..1e1f78b054 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -6964,7 +6964,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler); - menu_settings_list_current_add_range(list, list_info, 0, 4, 1, true, true); + menu_settings_list_current_add_range(list, list_info, 0, 5, 1, true, true); menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_MATERIALUI_MENU_COLOR_THEME); } diff --git a/msg_hash.h b/msg_hash.h index d4ca8117ad..50908eca04 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -305,6 +305,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_RIBBON, MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_BLUE, + MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_BLUE_GREY, MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_RED, MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_GREEN, MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_YELLOW,