Merge pull request #13119 from ofsaleem/master

feat: new ozone theme - solarized dark
This commit is contained in:
Autechre 2021-10-15 14:40:06 +02:00 committed by GitHub
commit eb4ed9b2f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 136 additions and 2 deletions

View File

@ -6265,6 +6265,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_HACKING_THE_KERNEL,
"قرصان القلوب"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"الظلام المشمس"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"الصورة المصغرة الثانية"

View File

@ -8393,6 +8393,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"德古拉"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"暗色曝光"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"第二缩略图"

View File

@ -8305,6 +8305,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_HACKING_THE_KERNEL,
"Den Kernel hacken"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarized dunkel"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Zweites Vorschaubild"

View File

@ -8529,6 +8529,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"Drácula"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarizado (oscuro)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Segunda miniatura"

View File

@ -8513,6 +8513,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_TWILIGHT_ZONE,
"Iltarusko"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarized, tumma"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Toinen esikatselukuva"

View File

@ -8537,6 +8537,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_TWILIGHT_ZONE,
"Quatrième dimension (Twilight Zone)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarisé sombre"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Miniature secondaire"

View File

@ -8465,6 +8465,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_TWILIGHT_ZONE,
"Zona Crepuscolare"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Scuro Solarizzato"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Seconda Copertina"

View File

@ -8609,6 +8609,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"드라큘라"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"솔라라이즈 다크"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"두 번째 미리보기"

View File

@ -8481,6 +8481,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"Drakula"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarized ciemny"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Druga miniatura"

View File

@ -8489,6 +8489,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"Drácula"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Escuro solarizado"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Segunda miniatura"

View File

@ -8621,6 +8621,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"Дракула"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarized тёмная"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Дополнительный эскиз"

View File

@ -8617,6 +8617,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"Drakula"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarize Koyu"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"İkinci Küçük Resim"

View File

@ -5129,6 +5129,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"Дракула"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Салорайзед темна"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Додаткова мініатюра"

View File

@ -9221,6 +9221,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"Dracula"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarized Dark"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Second Thumbnail"

View File

@ -931,9 +931,36 @@ static float ozone_sidebar_gradient_bottom_dracula[16] = {
0.2666666, 0.2784314, 0.3529412, 1.0f,
0.2666666, 0.2784314, 0.3529412, 1.0f,
0.2666666, 0.2784314, 0.3529412, 1.0f,
0.2666666, 0.2784314, 0.3529412, 1.0f,
0.2666666, 0.2784314, 0.3529412, 1.0f,
};
static float ozone_background_libretro_running_solarized_dark[16] = {
0.0000000, 0.1294118, 0.1725490, .85f,
0.0000000, 0.1294118, 0.1725490, .85f,
0.0000000, 0.1294118, 0.1725490, 1.0f,
0.0000000, 0.1294118, 0.1725490, 1.0f,
};
static float ozone_sidebar_background_solarized_dark[16] = {
0.0000000, 0.1294118, 0.1725490, 1.0f,
0.0000000, 0.1294118, 0.1725490, 1.0f,
0.0000000, 0.1294118, 0.1725490, 1.0f,
0.0000000, 0.1294118, 0.1725490, 1.0f,
};
static float ozone_sidebar_gradient_top_solarized_dark[16] = {
0.0000000, 0.1294118, 0.1725490, 1.0f,
0.0000000, 0.1294118, 0.1725490, 1.0f,
0.0000000, 0.1294118, 0.1725490, 1.0f,
0.0000000, 0.1294118, 0.1725490, 1.0f,
};
static float ozone_sidebar_gradient_bottom_solarized_dark[16] = {
0.0000000, 0.1294118, 0.1725490, 1.0f,
0.0000000, 0.1294118, 0.1725490, 1.0f,
0.0000000, 0.1294118, 0.1725490, 1.0f,
0.0000000, 0.1294118, 0.1725490, 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);
@ -959,6 +986,9 @@ static float ozone_border_1_twilight_zone[16] = COLOR_HEX_TO_FLOAT(0x9B61CC, 1.0
static float ozone_border_0_dracula[16] = COLOR_HEX_TO_FLOAT(0xC3A0E0, 1.0f);
static float ozone_border_1_dracula[16] = COLOR_HEX_TO_FLOAT(0x9B61CC, 1.0f);
static float ozone_border_0_solarized_dark[16] = COLOR_HEX_TO_FLOAT(0xC3A0E0, 1.0f);
static float ozone_border_1_solarized_dark[16] = COLOR_HEX_TO_FLOAT(0x9B61CC, 1.0f);
ozone_theme_t ozone_theme_light = {
COLOR_HEX_TO_FLOAT(0xEBEBEB, 1.00), /* background */
ozone_background_libretro_running_light, /* background_libretro_running */
@ -1245,6 +1275,43 @@ ozone_theme_t ozone_theme_dracula = {
"dracula" /* name */
};
ozone_theme_t ozone_theme_solarized_dark = {
/* Background color */
COLOR_HEX_TO_FLOAT(0x002B36, 1.0f), /* background */
ozone_background_libretro_running_solarized_dark, /* background_libretro_running */
/* Float colors for quads and icons */
COLOR_HEX_TO_FLOAT(0x839496, 1.0f), /* header_footer_separator */
COLOR_HEX_TO_FLOAT(0x839496, 1.0f), /* text */
COLOR_HEX_TO_FLOAT(0x073642, 1.0f), /* selection */
COLOR_HEX_TO_FLOAT(0x2AA198, 1.0f), /* selection_border */
COLOR_HEX_TO_FLOAT(0x073642, 1.0f), /* entries_border */
COLOR_HEX_TO_FLOAT(0x268BD2, 1.0f), /* entries_icon */
COLOR_HEX_TO_FLOAT(0x93A1A1, 1.0f), /* text_selected */
COLOR_HEX_TO_FLOAT(0x6C71C4, 1.0f), /* message_background */
/* RGBA colors for text */
0x839496FF, /* text_rgba */
0x2AA198FF, /* text_selected_rgba */
0x586E75FF, /* text_sublabel_rgba */
/* Screensaver 'tint' (RGB24) */
0x073642, /* screensaver_tint */
/* Sidebar color */
ozone_sidebar_background_solarized_dark, /* sidebar_background */
ozone_sidebar_gradient_top_solarized_dark, /* sidebar_top_gradient */
ozone_sidebar_gradient_bottom_solarized_dark, /* sidebar_bottom_gradient */
/* Fancy cursor colors */
ozone_border_0_solarized_dark, /* cursor_border_0 */
ozone_border_1_solarized_dark, /* cursor_border_1 */
{0}, /* textures */
"solarized dark" /* name */
};
ozone_theme_t *ozone_themes[] = {
&ozone_theme_light,
@ -1254,7 +1321,8 @@ ozone_theme_t *ozone_themes[] = {
&ozone_theme_boysenberry,
&ozone_theme_hacking_the_kernel,
&ozone_theme_twilight_zone,
&ozone_theme_dracula
&ozone_theme_dracula,
&ozone_theme_solarized_dark
};
@ -1381,6 +1449,9 @@ static void ozone_set_color_theme(ozone_handle_t *ozone, unsigned color_theme)
case OZONE_COLOR_THEME_DRACULA:
theme = &ozone_theme_dracula;
break;
case OZONE_COLOR_THEME_SOLARIZED_DARK:
theme = &ozone_theme_solarized_dark;
break;
default:
break;
}

View File

@ -365,6 +365,7 @@ enum ozone_color_theme
OZONE_COLOR_THEME_HACKING_THE_KERNEL,
OZONE_COLOR_THEME_TWILIGHT_ZONE,
OZONE_COLOR_THEME_DRACULA,
OZONE_COLOR_THEME_SOLARIZED_DARK,
OZONE_COLOR_THEME_LAST
};

View File

@ -4753,6 +4753,11 @@ static void setting_get_string_representation_uint_ozone_menu_color_theme(
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA), len);
break;
case OZONE_COLOR_THEME_SOLARIZED_DARK:
strlcpy(s,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK), len);
break;
case OZONE_COLOR_THEME_BASIC_WHITE:
default:
strlcpy(s,

View File

@ -602,6 +602,7 @@ 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_SOLARIZED_DARK,
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME,
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_INVERTED,