Gray Dark+Light theme adjustments (#17597)

intl/msg_hash_us.h

@@ -12347,6 +12347,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_MIDGAR,
    "Midgar"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_GRAY_DARK,
+   "Gray Dark"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_GRAY_LIGHT,
+   "Gray Light"
+   )
 
 /* Ozone: Settings > User Interface > Appearance */
 
@@ -12374,6 +12382,31 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_OZONE_SORT_AFTER_TRUNCATE_PLAYLIST_NAME,
    "Playlists will be re-sorted in alphabetical order after removing the manufacturer component of their names."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
+   "Secondary Thumbnail"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_LEFT_THUMBNAILS_OZONE,
+   "Replace the content metadata panel with another thumbnail."
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_OZONE_SCROLL_CONTENT_METADATA,
+   "Use Ticker Text for Content Metadata"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_OZONE_SCROLL_CONTENT_METADATA,
+   "When enabled, each item of content metadata shown on the right sidebar of playlists (associated core, play time) will occupy a single line; strings exceeding the width of the sidebar will be displayed as scrolling ticker text. When disabled, each item of content metadata will be displayed statically, wrapped to occupy as many lines as required."
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_OZONE_THUMBNAIL_SCALE_FACTOR,
+   "Thumbnail Scale Factor"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_OZONE_THUMBNAIL_SCALE_FACTOR,
+   "Scale the size of the thumbnail bar."
+   )
+
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_OZONE_MENU_COLOR_THEME,
    "Color Theme"
@@ -12414,10 +12447,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
    "Dracula"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SELENIUM,
-   "Selenium"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
    "Solarized Dark"
@@ -12439,30 +12468,11 @@ MSG_HASH(
    "Purple Rain"
    )
 MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
-   "Secondary Thumbnail"
-   )
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_LEFT_THUMBNAILS_OZONE,
-   "Replace the content metadata panel with another thumbnail."
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OZONE_SCROLL_CONTENT_METADATA,
-   "Use Ticker Text for Content Metadata"
-   )
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_OZONE_SCROLL_CONTENT_METADATA,
-   "When enabled, each item of content metadata shown on the right sidebar of playlists (associated core, play time) will occupy a single line; strings exceeding the width of the sidebar will be displayed as scrolling ticker text. When disabled, each item of content metadata will be displayed statically, wrapped to occupy as many lines as required."
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_OZONE_THUMBNAIL_SCALE_FACTOR,
-   "Thumbnail Scale Factor"
-   )
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_OZONE_THUMBNAIL_SCALE_FACTOR,
-   "Scale the size of the thumbnail bar."
+   MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SELENIUM,
+   "Selenium"
    )
 
+
 /* MaterialUI: Settings > User Interface > Appearance */
 
 MSG_HASH(

menu/drivers/materialui.c

@@ -1764,7 +1764,7 @@ static const materialui_theme_t *materialui_get_theme(enum materialui_color_them
       0xC0C0C0, /* on_header */
       0xC0C0C0, /* list_text */
       0xFFFFFF, /* list_text_highlighted */
-      0x707070, /* list_hint_text */
+      0x606060, /* list_hint_text */
       0x808080, /* list_hint_text_highlighted */
       0x808080, /* status_bar_text */
       /* Background colours */
@@ -1774,29 +1774,29 @@ static const materialui_theme_t *materialui_get_theme(enum materialui_color_them
       0x303030, /* list_highlighted_background */
       0x101010, /* nav_bar_background */
       0x202020, /* surface_background */
-      0x0C0C0C, /* thumbnail_background */
+      0x020202, /* thumbnail_background */
       0x101010, /* side_bar_background */
       0x101010, /* status_bar_background */
       /* List icon colours */
       0xFFFFFF, /* list_icon */
       0xFFFFFF, /* list_switch_on */
       0x202020, /* list_switch_on_background */
-      0x707070, /* list_switch_off */
+      0x606060, /* list_switch_off */
       0x202020, /* list_switch_off_background */
       /* Navigation bar icon colours */
       0xFFFFFF, /* nav_bar_icon_active */
-      0x707070, /* nav_bar_icon_passive */
-      0x202020, /* nav_bar_icon_disabled */
+      0x606060, /* nav_bar_icon_passive */
+      0x303030, /* nav_bar_icon_disabled */
       /* Screensaver */
       0x101010, /* screensaver_tint */
       /* Misc. colours */
       0x202020, /* header_shadow */
       0x202020, /* landscape_border_shadow */
       0x202020, /* status_bar_shadow */
-      0x0C0C0C, /* selection_marker_shadow */
+      0x202020, /* selection_marker_shadow */
       0x202020, /* scrollbar */
       0x101010, /* divider */
-      0x0C0C0C, /* screen_fade */
+      0x020202, /* screen_fade */
       0x202020, /* missing_thumbnail_icon */
       0.0f,     /* header_shadow_opacity */
       0.0f,     /* landscape_border_shadow_opacity */
@@ -1811,39 +1811,39 @@ static const materialui_theme_t *materialui_get_theme(enum materialui_color_them
       0xC0C0C0, /* on_header */
       0xC0C0C0, /* list_text */
       0xFFFFFF, /* list_text_highlighted */
-      0x707070, /* list_hint_text */
+      0x606060, /* list_hint_text */
       0x808080, /* list_hint_text_highlighted */
       0x808080, /* status_bar_text */
       /* Background colours */
-      0x303030, /* sys_bar_background */
-      0x303030, /* title_bar_background */
-      0x303030, /* list_background */
+      0x202020, /* sys_bar_background */
+      0x202020, /* title_bar_background */
+      0x202020, /* list_background */
       0x101010, /* list_highlighted_background */
-      0x303030, /* nav_bar_background */
+      0x202020, /* nav_bar_background */
       0x202020, /* surface_background */
-      0x0C0C0C, /* thumbnail_background */
-      0x303030, /* side_bar_background */
-      0x303030, /* status_bar_background */
+      0x020202, /* thumbnail_background */
+      0x202020, /* side_bar_background */
+      0x202020, /* status_bar_background */
       /* List icon colours */
       0xFFFFFF, /* list_icon */
       0xFFFFFF, /* list_switch_on */
-      0x202020, /* list_switch_on_background */
-      0x707070, /* list_switch_off */
-      0x202020, /* list_switch_off_background */
+      0x303030, /* list_switch_on_background */
+      0x606060, /* list_switch_off */
+      0x303030, /* list_switch_off_background */
       /* Navigation bar icon colours */
       0xFFFFFF, /* nav_bar_icon_active */
-      0x707070, /* nav_bar_icon_passive */
-      0x202020, /* nav_bar_icon_disabled */
+      0x606060, /* nav_bar_icon_passive */
+      0x303030, /* nav_bar_icon_disabled */
       /* Screensaver */
       0x101010, /* screensaver_tint */
       /* Misc. colours */
       0x202020, /* header_shadow */
       0x202020, /* landscape_border_shadow */
       0x202020, /* status_bar_shadow */
-      0x0C0C0C, /* selection_marker_shadow */
-      0x202020, /* scrollbar */
-      0x303030, /* divider */
-      0x0C0C0C, /* screen_fade */
+      0x202020, /* selection_marker_shadow */
+      0x303030, /* scrollbar */
+      0x202020, /* divider */
+      0x020202, /* screen_fade */
       0x202020, /* missing_thumbnail_icon */
       0.0f,     /* header_shadow_opacity */
       0.0f,     /* landscape_border_shadow_opacity */

menu/drivers/ozone.c

@@ -816,7 +816,7 @@ static float ozone_sidebar_background_gray_dark[16]                   =
    COLOR_HEX_TO_FLOAT(0x101010, 0.0f);
 
 static float ozone_sidebar_background_gray_light[16]                  =
-   COLOR_HEX_TO_FLOAT(0x303030, 0.0f);
+   COLOR_HEX_TO_FLOAT(0x202020, 0.0f);
 
 static float ozone_sidebar_background_light[16]                       = {
    0.94f, 0.94f, 0.94f, 1.00f,
@@ -905,7 +905,7 @@ static float ozone_background_libretro_running_gray_dark[16]          =
    COLOR_HEX_TO_FLOAT(0x101010, 1.0f);
 
 static float ozone_background_libretro_running_gray_light[16]         =
-   COLOR_HEX_TO_FLOAT(0x303030, 1.0f);
+   COLOR_HEX_TO_FLOAT(0x202020, 1.0f);
 
 static float ozone_background_libretro_running_light[16]              = {
    0.690f, 0.690f, 0.690f, 0.75f,
@@ -1409,7 +1409,7 @@ static ozone_theme_t ozone_theme_gray_dark = {
    COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.0f),                   /* text */
    COLOR_HEX_TO_FLOAT(0x303030, 1.0f),                   /* selection */
    COLOR_HEX_TO_FLOAT(0x303030, 1.0f),                   /* selection_border */
-   COLOR_HEX_TO_FLOAT(0x181818, 1.0f),                   /* entries_border */
+   COLOR_HEX_TO_FLOAT(0x101010, 1.0f),                   /* entries_border */
    COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.0f),                   /* entries_icon */
    COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.0f),                   /* text_selected */
    COLOR_HEX_TO_FLOAT(0x202020, 1.0f),                   /* message_background */
@@ -1418,7 +1418,7 @@ static ozone_theme_t ozone_theme_gray_dark = {
    0xC0C0C0FF,                                           /* text_rgba */
    0x808080FF,                                           /* text_sidebar_rgba */
    0xFFFFFFFF,                                           /* text_selected_rgba */
-   0x707070FF,                                           /* text_sublabel_rgba */
+   0x606060FF,                                           /* text_sublabel_rgba */
 
    /* Screensaver 'tint' (RGB24) */
    0xFFFFFF,                                             /* screensaver_tint */
@@ -1440,15 +1440,15 @@ static ozone_theme_t ozone_theme_gray_dark = {
 
 static ozone_theme_t ozone_theme_gray_light = {
    /* Background color */
-   COLOR_HEX_TO_FLOAT(0x303030, 1.0f),                   /* background */
+   COLOR_HEX_TO_FLOAT(0x202020, 1.0f),                   /* background */
    ozone_background_libretro_running_gray_light,         /* background_libretro_running */
 
    /* Float colors for quads and icons */
    COLOR_HEX_TO_FLOAT(0x000000, 0.0f),                   /* header_footer_separator */
    COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.0f),                   /* text */
    COLOR_HEX_TO_FLOAT(0x101010, 1.0f),                   /* selection */
    COLOR_HEX_TO_FLOAT(0x101010, 1.0f),                   /* selection_border */
-   COLOR_HEX_TO_FLOAT(0x282828, 1.0f),                   /* entries_border */
+   COLOR_HEX_TO_FLOAT(0x202020, 1.0f),                   /* entries_border */
    COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.0f),                   /* entries_icon */
    COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.0f),                   /* text_selected */
    COLOR_HEX_TO_FLOAT(0x202020, 1.0f),                   /* message_background */
@@ -1457,7 +1457,7 @@ static ozone_theme_t ozone_theme_gray_light = {
    0xC0C0C0FF,                                           /* text_rgba */
    0x808080FF,                                           /* text_sidebar_rgba */
    0xFFFFFFFF,                                           /* text_selected_rgba */
-   0x707070FF,                                           /* text_sublabel_rgba */
+   0x606060FF,                                           /* text_sublabel_rgba */
 
    /* Screensaver 'tint' (RGB24) */
    0xFFFFFF,                                             /* screensaver_tint */

menu/drivers/rgui.c

@@ -1156,8 +1156,8 @@ static const rgui_theme_t rgui_theme_gray_dark = {
    0xFFFFFFFF, /* title_color */
    0xE0101010, /* bg_dark_color */
    0xE0101010, /* bg_light_color */
-   0xE0303030, /* border_dark_color */
-   0xE0303030, /* border_light_color */
+   0xE0202020, /* border_dark_color */
+   0xE0202020, /* border_light_color */
    0xFF000000, /* shadow_color */
    0xE0202020  /* particle_color */
 };
@@ -1168,8 +1168,8 @@ static const rgui_theme_t rgui_theme_opaque_gray_dark = {
    0xFFFFFFFF, /* title_color */
    0xFF101010, /* bg_dark_color */
    0xFF101010, /* bg_light_color */
-   0xFF303030, /* border_dark_color */
-   0xFF303030, /* border_light_color */
+   0xFF202020, /* border_dark_color */
+   0xFF202020, /* border_light_color */
    0xFF000000, /* shadow_color */
    0xE0202020  /* particle_color */
 };
@@ -1178,8 +1178,8 @@ 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 */
+   0xE0202020, /* bg_dark_color */
+   0xE0202020, /* bg_light_color */
    0xE0101010, /* border_dark_color */
    0xE0101010, /* border_light_color */
    0xFF000000, /* shadow_color */
@@ -1190,8 +1190,8 @@ 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 */
+   0xFF202020, /* bg_dark_color */
+   0xFF202020, /* bg_light_color */
    0xFF101010, /* border_dark_color */
    0xFF101010, /* border_light_color */
    0xFF000000, /* shadow_color */

menu/drivers/xmb.c

@@ -786,10 +786,22 @@ static float *xmb_gradient_ident(unsigned xmb_color_theme)
            0.05,      0.05,      0.05, 1.0,
    };
    static float gradient_light[16]           = {
-           0.25,      0.25,      0.25, 1.0,
-           0.25,      0.25,      0.25, 1.0,
-           0.25,      0.25,      0.25, 1.0,
-           0.25,      0.25,      0.25, 1.0,
+           0.50,      0.50,      0.50, 1.0,
+           0.50,      0.50,      0.50, 1.0,
+           0.50,      0.50,      0.50, 1.0,
+           0.50,      0.50,      0.50, 1.0,
+   };
+   static float gradient_gray_dark[16]       = {
+           0.10,      0.10,      0.10, 1.0,
+           0.10,      0.10,      0.10, 1.0,
+           0.10,      0.10,      0.10, 1.0,
+           0.10,      0.10,      0.10, 1.0,
+   };
+   static float gradient_gray_light[16]      = {
+           0.20,      0.20,      0.20, 1.0,
+           0.20,      0.20,      0.20, 1.0,
+           0.20,      0.20,      0.20, 1.0,
+           0.20,      0.20,      0.20, 1.0,
    };
 
    switch (xmb_color_theme)
@@ -832,6 +844,10 @@ static float *xmb_gradient_ident(unsigned xmb_color_theme)
          return &gradient_ice_cold[0];
       case XMB_THEME_LEGACY_RED:
          return &gradient_legacy_red[0];
+      case XMB_THEME_GRAY_DARK:
+         return &gradient_gray_dark[0];
+      case XMB_THEME_GRAY_LIGHT:
+         return &gradient_gray_light[0];
       default:
          return &gradient_dark[0];
    }

menu/menu_defines.h

@@ -316,6 +316,8 @@ enum xmb_color_theme
    XMB_THEME_FLAMING_HOT,
    XMB_THEME_ICE_COLD,
    XMB_THEME_MIDGAR,
+   XMB_THEME_GRAY_DARK,
+   XMB_THEME_GRAY_LIGHT,
    XMB_THEME_LAST
 };
 

menu/menu_setting.c

@@ -4233,6 +4233,16 @@ static size_t setting_get_string_representation_uint_xmb_menu_color_theme(
                   msg_hash_to_str(
                      MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_ICE_COLD),
                   len);
+         case XMB_THEME_GRAY_DARK:
+            return strlcpy(s,
+                  msg_hash_to_str(
+                     MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_GRAY_DARK),
+                  len);
+         case XMB_THEME_GRAY_LIGHT:
+            return strlcpy(s,
+                  msg_hash_to_str(
+                     MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_GRAY_LIGHT),
+                  len);
       }
    }
    return 0;

msg_hash.h

@@ -729,12 +729,12 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_HACKING_THE_KERNEL,
    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_TWILIGHT_ZONE,
    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
-   MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SELENIUM,
    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT,
    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_GRAY_DARK,
    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_XMB_ICON_THEME_MONOCHROME,
    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_INVERTED,
@@ -769,6 +769,8 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_FLAMING_HOT,
    MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_ICE_COLD,
    MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_MIDGAR,
+   MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_GRAY_DARK,
+   MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_GRAY_LIGHT,
 
    MENU_LABEL(SHADER_PIPELINE_RIBBON_SIMPLIFIED),
    MENU_LABEL(SHADER_PIPELINE_RIBBON),