Skip to content

Commit e4fe551

Browse files
sonninnossonninnos
authored
Gray Dark+Light theme adjustments (#17597)
1 parent 087d11b commit e4fe551

File tree

8 files changed

+110
-70
lines changed

8 files changed

+110
-70
lines changed

‎intl/msg_hash_us.h‎

Lines changed: 36 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12347,6 +12347,14 @@ MSG_HASH(
1234712347
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_MIDGAR,
1234812348
"Midgar"
1234912349
)
12350+
MSG_HASH(
12351+
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_GRAY_DARK,
12352+
"Gray Dark"
12353+
)
12354+
MSG_HASH(
12355+
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_GRAY_LIGHT,
12356+
"Gray Light"
12357+
)
1235012358

1235112359
/* Ozone: Settings > User Interface > Appearance */
1235212360

@@ -12374,6 +12382,31 @@ MSG_HASH(
1237412382
MENU_ENUM_SUBLABEL_OZONE_SORT_AFTER_TRUNCATE_PLAYLIST_NAME,
1237512383
"Playlists will be re-sorted in alphabetical order after removing the manufacturer component of their names."
1237612384
)
12385+
MSG_HASH(
12386+
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
12387+
"Secondary Thumbnail"
12388+
)
12389+
MSG_HASH(
12390+
MENU_ENUM_SUBLABEL_LEFT_THUMBNAILS_OZONE,
12391+
"Replace the content metadata panel with another thumbnail."
12392+
)
12393+
MSG_HASH(
12394+
MENU_ENUM_LABEL_VALUE_OZONE_SCROLL_CONTENT_METADATA,
12395+
"Use Ticker Text for Content Metadata"
12396+
)
12397+
MSG_HASH(
12398+
MENU_ENUM_SUBLABEL_OZONE_SCROLL_CONTENT_METADATA,
12399+
"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."
12400+
)
12401+
MSG_HASH(
12402+
MENU_ENUM_LABEL_VALUE_OZONE_THUMBNAIL_SCALE_FACTOR,
12403+
"Thumbnail Scale Factor"
12404+
)
12405+
MSG_HASH(
12406+
MENU_ENUM_SUBLABEL_OZONE_THUMBNAIL_SCALE_FACTOR,
12407+
"Scale the size of the thumbnail bar."
12408+
)
12409+
1237712410
MSG_HASH(
1237812411
MENU_ENUM_LABEL_VALUE_OZONE_MENU_COLOR_THEME,
1237912412
"Color Theme"
@@ -12414,10 +12447,6 @@ MSG_HASH(
1241412447
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
1241512448
"Dracula"
1241612449
)
12417-
MSG_HASH(
12418-
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SELENIUM,
12419-
"Selenium"
12420-
)
1242112450
MSG_HASH(
1242212451
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
1242312452
"Solarized Dark"
@@ -12439,30 +12468,11 @@ MSG_HASH(
1243912468
"Purple Rain"
1244012469
)
1244112470
MSG_HASH(
12442-
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
12443-
"Secondary Thumbnail"
12444-
)
12445-
MSG_HASH(
12446-
MENU_ENUM_SUBLABEL_LEFT_THUMBNAILS_OZONE,
12447-
"Replace the content metadata panel with another thumbnail."
12448-
)
12449-
MSG_HASH(
12450-
MENU_ENUM_LABEL_VALUE_OZONE_SCROLL_CONTENT_METADATA,
12451-
"Use Ticker Text for Content Metadata"
12452-
)
12453-
MSG_HASH(
12454-
MENU_ENUM_SUBLABEL_OZONE_SCROLL_CONTENT_METADATA,
12455-
"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."
12456-
)
12457-
MSG_HASH(
12458-
MENU_ENUM_LABEL_VALUE_OZONE_THUMBNAIL_SCALE_FACTOR,
12459-
"Thumbnail Scale Factor"
12460-
)
12461-
MSG_HASH(
12462-
MENU_ENUM_SUBLABEL_OZONE_THUMBNAIL_SCALE_FACTOR,
12463-
"Scale the size of the thumbnail bar."
12471+
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SELENIUM,
12472+
"Selenium"
1246412473
)
1246512474

12475+
1246612476
/* MaterialUI: Settings > User Interface > Appearance */
1246712477

1246812478
MSG_HASH(

‎menu/drivers/materialui.c‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1764,7 +1764,7 @@ static const materialui_theme_t *materialui_get_theme(enum materialui_color_them
17641764
0xC0C0C0, /* on_header */
17651765
0xC0C0C0, /* list_text */
17661766
0xFFFFFF, /* list_text_highlighted */
1767-
0x707070, /* list_hint_text */
1767+
0x606060, /* list_hint_text */
17681768
0x808080, /* list_hint_text_highlighted */
17691769
0x808080, /* status_bar_text */
17701770
/* Background colours */
@@ -1774,29 +1774,29 @@ static const materialui_theme_t *materialui_get_theme(enum materialui_color_them
17741774
0x303030, /* list_highlighted_background */
17751775
0x101010, /* nav_bar_background */
17761776
0x202020, /* surface_background */
1777-
0x0C0C0C, /* thumbnail_background */
1777+
0x020202, /* thumbnail_background */
17781778
0x101010, /* side_bar_background */
17791779
0x101010, /* status_bar_background */
17801780
/* List icon colours */
17811781
0xFFFFFF, /* list_icon */
17821782
0xFFFFFF, /* list_switch_on */
17831783
0x202020, /* list_switch_on_background */
1784-
0x707070, /* list_switch_off */
1784+
0x606060, /* list_switch_off */
17851785
0x202020, /* list_switch_off_background */
17861786
/* Navigation bar icon colours */
17871787
0xFFFFFF, /* nav_bar_icon_active */
1788-
0x707070, /* nav_bar_icon_passive */
1789-
0x202020, /* nav_bar_icon_disabled */
1788+
0x606060, /* nav_bar_icon_passive */
1789+
0x303030, /* nav_bar_icon_disabled */
17901790
/* Screensaver */
17911791
0x101010, /* screensaver_tint */
17921792
/* Misc. colours */
17931793
0x202020, /* header_shadow */
17941794
0x202020, /* landscape_border_shadow */
17951795
0x202020, /* status_bar_shadow */
1796-
0x0C0C0C, /* selection_marker_shadow */
1796+
0x202020, /* selection_marker_shadow */
17971797
0x202020, /* scrollbar */
17981798
0x101010, /* divider */
1799-
0x0C0C0C, /* screen_fade */
1799+
0x020202, /* screen_fade */
18001800
0x202020, /* missing_thumbnail_icon */
18011801
0.0f, /* header_shadow_opacity */
18021802
0.0f, /* landscape_border_shadow_opacity */
@@ -1811,39 +1811,39 @@ static const materialui_theme_t *materialui_get_theme(enum materialui_color_them
18111811
0xC0C0C0, /* on_header */
18121812
0xC0C0C0, /* list_text */
18131813
0xFFFFFF, /* list_text_highlighted */
1814-
0x707070, /* list_hint_text */
1814+
0x606060, /* list_hint_text */
18151815
0x808080, /* list_hint_text_highlighted */
18161816
0x808080, /* status_bar_text */
18171817
/* Background colours */
1818-
0x303030, /* sys_bar_background */
1819-
0x303030, /* title_bar_background */
1820-
0x303030, /* list_background */
1818+
0x202020, /* sys_bar_background */
1819+
0x202020, /* title_bar_background */
1820+
0x202020, /* list_background */
18211821
0x101010, /* list_highlighted_background */
1822-
0x303030, /* nav_bar_background */
1822+
0x202020, /* nav_bar_background */
18231823
0x202020, /* surface_background */
1824-
0x0C0C0C, /* thumbnail_background */
1825-
0x303030, /* side_bar_background */
1826-
0x303030, /* status_bar_background */
1824+
0x020202, /* thumbnail_background */
1825+
0x202020, /* side_bar_background */
1826+
0x202020, /* status_bar_background */
18271827
/* List icon colours */
18281828
0xFFFFFF, /* list_icon */
18291829
0xFFFFFF, /* list_switch_on */
1830-
0x202020, /* list_switch_on_background */
1831-
0x707070, /* list_switch_off */
1832-
0x202020, /* list_switch_off_background */
1830+
0x303030, /* list_switch_on_background */
1831+
0x606060, /* list_switch_off */
1832+
0x303030, /* list_switch_off_background */
18331833
/* Navigation bar icon colours */
18341834
0xFFFFFF, /* nav_bar_icon_active */
1835-
0x707070, /* nav_bar_icon_passive */
1836-
0x202020, /* nav_bar_icon_disabled */
1835+
0x606060, /* nav_bar_icon_passive */
1836+
0x303030, /* nav_bar_icon_disabled */
18371837
/* Screensaver */
18381838
0x101010, /* screensaver_tint */
18391839
/* Misc. colours */
18401840
0x202020, /* header_shadow */
18411841
0x202020, /* landscape_border_shadow */
18421842
0x202020, /* status_bar_shadow */
1843-
0x0C0C0C, /* selection_marker_shadow */
1844-
0x202020, /* scrollbar */
1845-
0x303030, /* divider */
1846-
0x0C0C0C, /* screen_fade */
1843+
0x202020, /* selection_marker_shadow */
1844+
0x303030, /* scrollbar */
1845+
0x202020, /* divider */
1846+
0x020202, /* screen_fade */
18471847
0x202020, /* missing_thumbnail_icon */
18481848
0.0f, /* header_shadow_opacity */
18491849
0.0f, /* landscape_border_shadow_opacity */

‎menu/drivers/ozone.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ static float ozone_sidebar_background_gray_dark[16] =
816816
COLOR_HEX_TO_FLOAT(0x101010, 0.0f);
817817

818818
static float ozone_sidebar_background_gray_light[16] =
819-
COLOR_HEX_TO_FLOAT(0x303030, 0.0f);
819+
COLOR_HEX_TO_FLOAT(0x202020, 0.0f);
820820

821821
static float ozone_sidebar_background_light[16] = {
822822
0.94f, 0.94f, 0.94f, 1.00f,
@@ -905,7 +905,7 @@ static float ozone_background_libretro_running_gray_dark[16] =
905905
COLOR_HEX_TO_FLOAT(0x101010, 1.0f);
906906

907907
static float ozone_background_libretro_running_gray_light[16] =
908-
COLOR_HEX_TO_FLOAT(0x303030, 1.0f);
908+
COLOR_HEX_TO_FLOAT(0x202020, 1.0f);
909909

910910
static float ozone_background_libretro_running_light[16] = {
911911
0.690f, 0.690f, 0.690f, 0.75f,
@@ -1409,7 +1409,7 @@ static ozone_theme_t ozone_theme_gray_dark = {
14091409
COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.0f), /* text */
14101410
COLOR_HEX_TO_FLOAT(0x303030, 1.0f), /* selection */
14111411
COLOR_HEX_TO_FLOAT(0x303030, 1.0f), /* selection_border */
1412-
COLOR_HEX_TO_FLOAT(0x181818, 1.0f), /* entries_border */
1412+
COLOR_HEX_TO_FLOAT(0x101010, 1.0f), /* entries_border */
14131413
COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.0f), /* entries_icon */
14141414
COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.0f), /* text_selected */
14151415
COLOR_HEX_TO_FLOAT(0x202020, 1.0f), /* message_background */
@@ -1418,7 +1418,7 @@ static ozone_theme_t ozone_theme_gray_dark = {
14181418
0xC0C0C0FF, /* text_rgba */
14191419
0x808080FF, /* text_sidebar_rgba */
14201420
0xFFFFFFFF, /* text_selected_rgba */
1421-
0x707070FF, /* text_sublabel_rgba */
1421+
0x606060FF, /* text_sublabel_rgba */
14221422

14231423
/* Screensaver 'tint' (RGB24) */
14241424
0xFFFFFF, /* screensaver_tint */
@@ -1440,15 +1440,15 @@ static ozone_theme_t ozone_theme_gray_dark = {
14401440

14411441
static ozone_theme_t ozone_theme_gray_light = {
14421442
/* Background color */
1443-
COLOR_HEX_TO_FLOAT(0x303030, 1.0f), /* background */
1443+
COLOR_HEX_TO_FLOAT(0x202020, 1.0f), /* background */
14441444
ozone_background_libretro_running_gray_light, /* background_libretro_running */
14451445

14461446
/* Float colors for quads and icons */
14471447
COLOR_HEX_TO_FLOAT(0x000000, 0.0f), /* header_footer_separator */
14481448
COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.0f), /* text */
14491449
COLOR_HEX_TO_FLOAT(0x101010, 1.0f), /* selection */
14501450
COLOR_HEX_TO_FLOAT(0x101010, 1.0f), /* selection_border */
1451-
COLOR_HEX_TO_FLOAT(0x282828, 1.0f), /* entries_border */
1451+
COLOR_HEX_TO_FLOAT(0x202020, 1.0f), /* entries_border */
14521452
COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.0f), /* entries_icon */
14531453
COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.0f), /* text_selected */
14541454
COLOR_HEX_TO_FLOAT(0x202020, 1.0f), /* message_background */
@@ -1457,7 +1457,7 @@ static ozone_theme_t ozone_theme_gray_light = {
14571457
0xC0C0C0FF, /* text_rgba */
14581458
0x808080FF, /* text_sidebar_rgba */
14591459
0xFFFFFFFF, /* text_selected_rgba */
1460-
0x707070FF, /* text_sublabel_rgba */
1460+
0x606060FF, /* text_sublabel_rgba */
14611461

14621462
/* Screensaver 'tint' (RGB24) */
14631463
0xFFFFFF, /* screensaver_tint */

‎menu/drivers/rgui.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1156,8 +1156,8 @@ static const rgui_theme_t rgui_theme_gray_dark = {
11561156
0xFFFFFFFF, /* title_color */
11571157
0xE0101010, /* bg_dark_color */
11581158
0xE0101010, /* bg_light_color */
1159-
0xE0303030, /* border_dark_color */
1160-
0xE0303030, /* border_light_color */
1159+
0xE0202020, /* border_dark_color */
1160+
0xE0202020, /* border_light_color */
11611161
0xFF000000, /* shadow_color */
11621162
0xE0202020 /* particle_color */
11631163
};
@@ -1168,8 +1168,8 @@ static const rgui_theme_t rgui_theme_opaque_gray_dark = {
11681168
0xFFFFFFFF, /* title_color */
11691169
0xFF101010, /* bg_dark_color */
11701170
0xFF101010, /* bg_light_color */
1171-
0xFF303030, /* border_dark_color */
1172-
0xFF303030, /* border_light_color */
1171+
0xFF202020, /* border_dark_color */
1172+
0xFF202020, /* border_light_color */
11731173
0xFF000000, /* shadow_color */
11741174
0xE0202020 /* particle_color */
11751175
};
@@ -1178,8 +1178,8 @@ static const rgui_theme_t rgui_theme_gray_light = {
11781178
0xFFFFFFFF, /* hover_color */
11791179
0xFF808080, /* normal_color */
11801180
0xFFFFFFFF, /* title_color */
1181-
0xE0303030, /* bg_dark_color */
1182-
0xE0303030, /* bg_light_color */
1181+
0xE0202020, /* bg_dark_color */
1182+
0xE0202020, /* bg_light_color */
11831183
0xE0101010, /* border_dark_color */
11841184
0xE0101010, /* border_light_color */
11851185
0xFF000000, /* shadow_color */
@@ -1190,8 +1190,8 @@ static const rgui_theme_t rgui_theme_opaque_gray_light = {
11901190
0xFFFFFFFF, /* hover_color */
11911191
0xFF808080, /* normal_color */
11921192
0xFFFFFFFF, /* title_color */
1193-
0xFF303030, /* bg_dark_color */
1194-
0xFF303030, /* bg_light_color */
1193+
0xFF202020, /* bg_dark_color */
1194+
0xFF202020, /* bg_light_color */
11951195
0xFF101010, /* border_dark_color */
11961196
0xFF101010, /* border_light_color */
11971197
0xFF000000, /* shadow_color */

‎menu/drivers/xmb.c‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -786,10 +786,22 @@ static float *xmb_gradient_ident(unsigned xmb_color_theme)
786786
0.05, 0.05, 0.05, 1.0,
787787
};
788788
static float gradient_light[16] = {
789-
0.25, 0.25, 0.25, 1.0,
790-
0.25, 0.25, 0.25, 1.0,
791-
0.25, 0.25, 0.25, 1.0,
792-
0.25, 0.25, 0.25, 1.0,
789+
0.50, 0.50, 0.50, 1.0,
790+
0.50, 0.50, 0.50, 1.0,
791+
0.50, 0.50, 0.50, 1.0,
792+
0.50, 0.50, 0.50, 1.0,
793+
};
794+
static float gradient_gray_dark[16] = {
795+
0.10, 0.10, 0.10, 1.0,
796+
0.10, 0.10, 0.10, 1.0,
797+
0.10, 0.10, 0.10, 1.0,
798+
0.10, 0.10, 0.10, 1.0,
799+
};
800+
static float gradient_gray_light[16] = {
801+
0.20, 0.20, 0.20, 1.0,
802+
0.20, 0.20, 0.20, 1.0,
803+
0.20, 0.20, 0.20, 1.0,
804+
0.20, 0.20, 0.20, 1.0,
793805
};
794806

795807
switch (xmb_color_theme)
@@ -832,6 +844,10 @@ static float *xmb_gradient_ident(unsigned xmb_color_theme)
832844
return &gradient_ice_cold[0];
833845
case XMB_THEME_LEGACY_RED:
834846
return &gradient_legacy_red[0];
847+
case XMB_THEME_GRAY_DARK:
848+
return &gradient_gray_dark[0];
849+
case XMB_THEME_GRAY_LIGHT:
850+
return &gradient_gray_light[0];
835851
default:
836852
return &gradient_dark[0];
837853
}

‎menu/menu_defines.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,8 @@ enum xmb_color_theme
316316
XMB_THEME_FLAMING_HOT,
317317
XMB_THEME_ICE_COLD,
318318
XMB_THEME_MIDGAR,
319+
XMB_THEME_GRAY_DARK,
320+
XMB_THEME_GRAY_LIGHT,
319321
XMB_THEME_LAST
320322
};
321323

‎menu/menu_setting.c‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4233,6 +4233,16 @@ static size_t setting_get_string_representation_uint_xmb_menu_color_theme(
42334233
msg_hash_to_str(
42344234
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_ICE_COLD),
42354235
len);
4236+
case XMB_THEME_GRAY_DARK:
4237+
return strlcpy(s,
4238+
msg_hash_to_str(
4239+
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_GRAY_DARK),
4240+
len);
4241+
case XMB_THEME_GRAY_LIGHT:
4242+
return strlcpy(s,
4243+
msg_hash_to_str(
4244+
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_GRAY_LIGHT),
4245+
len);
42364246
}
42374247
}
42384248
return 0;

‎msg_hash.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,12 +729,12 @@ enum msg_hash_enums
729729
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_HACKING_THE_KERNEL,
730730
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_TWILIGHT_ZONE,
731731
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
732-
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SELENIUM,
733732
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
734733
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT,
735734
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_GRAY_DARK,
736735
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_GRAY_LIGHT,
737736
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_PURPLE_RAIN,
737+
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SELENIUM,
738738

739739
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME,
740740
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_INVERTED,
@@ -769,6 +769,8 @@ enum msg_hash_enums
769769
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_FLAMING_HOT,
770770
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_ICE_COLD,
771771
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_MIDGAR,
772+
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_GRAY_DARK,
773+
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_GRAY_LIGHT,
772774

773775
MENU_LABEL(SHADER_PIPELINE_RIBBON_SIMPLIFIED),
774776
MENU_LABEL(SHADER_PIPELINE_RIBBON),

0 commit comments

Comments
 (0)