diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index 3322e790a6..4f21f38c5c 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -2121,10 +2121,10 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) return "Ribbon (simplified)"; case MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_RIBBON: return "Ribbon"; - case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_WHITE: - return "White"; - case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_DARK: - return "Dark"; + case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_BLUE: + return "Blue"; + case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_DARK_BLUE: + return "Dark Blue"; case MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LEGACY_RED: return "Legacy Red"; case MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK_PURPLE: diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index 1188c52a88..2d505a2eff 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -791,15 +791,15 @@ static void menu_action_setting_disp_set_label_materialui_menu_color_theme( switch (settings->menu.materialui.menu_color_theme) { - case THEME_BLUE: + case MATERIALUI_THEME_BLUE: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_WHITE), len); + MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_BLUE), len); break; - case THEME_DARK_BLUE: + case MATERIALUI_THEME_DARK_BLUE: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_DARK), len); + MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_DARK_BLUE), len); break; default: break; diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 169575b0f8..658aed2983 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -831,9 +831,9 @@ static void mui_frame(void *data) switch (settings->menu.materialui.menu_color_theme) { - case 0: + case MATERIALUI_THEME_BLUE: break; - case 1: /* DARK */ + case MATERIALUI_THEME_DARK_BLUE: header_bg_color = greyish_blue; highlighted_entry_color = grey_bg; footer_bg_color = almost_black; diff --git a/menu/menu_display.h b/menu/menu_display.h index f2ce10f769..57f396dfd4 100644 --- a/menu/menu_display.h +++ b/menu/menu_display.h @@ -31,8 +31,8 @@ RETRO_BEGIN_DECLS enum materialui_color_theme { - THEME_BLUE = 0, - THEME_DARK_BLUE + MATERIALUI_THEME_BLUE = 0, + MATERIALUI_THEME_DARK_BLUE }; enum menu_display_prim_type diff --git a/msg_hash.h b/msg_hash.h index 9d7b85572f..acd0096e0b 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -304,8 +304,8 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_RIBBON_SIMPLIFIED, MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_RIBBON, - MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_WHITE, - MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_DARK, + MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_BLUE, + MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_DARK_BLUE, MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_LATE, MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_NORMAL,