Merge pull request #12268 from digitalisland-nino/dracula_ozone

(ozone) new theme: Dracula
This commit is contained in:
Autechre 2021-04-15 02:00:07 +02:00 committed by GitHub
commit 36bf1ad112
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 120 additions and 5 deletions

View File

@ -6172,6 +6172,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_HACKING_THE_KERNEL,
"قرصان القلوب"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"دراكولا"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"الصورة المصغرة الثانية"

View File

@ -2116,6 +2116,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_GRUVBOX_DARK,
"Escuridá Gruvbox"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"Drácula"
)
/* MaterialUI: Settings > User Interface > Appearance */

View File

@ -8144,6 +8144,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_TWILIGHT_ZONE,
"模糊地带"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"德古拉"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"第二缩略图"

View File

@ -8192,6 +8192,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_HACKING_THE_KERNEL,
"Hackeando el kernel"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"Drácula"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Segunda miniatura"

View File

@ -8272,6 +8272,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_TWILIGHT_ZONE,
"환상특급"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"드라큘라"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"두 번째 미리보기"

View File

@ -8148,6 +8148,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_HACKING_THE_KERNEL,
"Hackeando o kernel"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"Drácula"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Segunda miniatura"

View File

@ -7236,6 +7236,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_TWILIGHT_ZONE,
"Alacakaranlık Bölgesi"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"Drakula"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"İkinci Küçük Resim"

View File

@ -4668,6 +4668,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_HACKING_THE_KERNEL,
"Зламати ядро"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"Дракула"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Додаткова мініатюра"

View File

@ -8934,6 +8934,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_TWILIGHT_ZONE,
"Twilight Zone"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"Dracula"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Second Thumbnail"

View File

@ -151,7 +151,7 @@ static float ozone_sidebar_gradient_top_boysenberry[16] = {
0.27058823529, 0.09803921568, 0.14117647058, 1.00,
0.27058823529, 0.09803921568, 0.14117647058, 1.00,
0.19215686274, 0.0, 0.04705882352, 1.00,
0.19215686274, 0.0, 0.04705882352, 1.00,
0.19215686274, 0.0, 0.04705882352, 1.00,
};
static float ozone_sidebar_gradient_bottom_boysenberry[16] = {
@ -179,7 +179,7 @@ static float ozone_sidebar_gradient_top_hacking_the_kernel[16] = {
0.0, 0.13333333, 0.0, 1.0f,
0.0, 0.13333333, 0.0, 1.0f,
0.0, 0.13333333, 0.0, 1.0f,
0.0, 0.13333333, 0.0, 1.0f,
0.0, 0.13333333, 0.0, 1.0f,
};
static float ozone_sidebar_gradient_bottom_hacking_the_kernel[16] = {
@ -207,7 +207,7 @@ static float ozone_sidebar_gradient_top_twilight_zone[16] = {
0.0078431, 0.0, 0.0156862, 1.0f,
0.0078431, 0.0, 0.0156862, 1.0f,
0.0078431, 0.0, 0.0156862, 1.0f,
0.0078431, 0.0, 0.0156862, 1.0f,
0.0078431, 0.0, 0.0156862, 1.0f,
};
static float ozone_sidebar_gradient_bottom_twilight_zone[16] = {
@ -217,6 +217,34 @@ static float ozone_sidebar_gradient_bottom_twilight_zone[16] = {
0.0078431, 0.0, 0.0156862, 1.0f,
};
static float ozone_background_libretro_running_dracula[16] = {
0.1568627, 0.1647058, 0.2117647, 0.75f,
0.1568627, 0.1647058, 0.2117647, 0.75f,
0.1568627, 0.1647058, 0.2117647, 1.0f,
0.1568627, 0.1647058, 0.2117647, 1.0f,
};
static float ozone_sidebar_background_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,
};
static float ozone_sidebar_gradient_top_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,
};
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,
};
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);
@ -239,6 +267,9 @@ static float ozone_border_1_hacking_the_kernel[16] = COLOR_HEX_TO_FLOAT(0x00E000
static float ozone_border_0_twilight_zone[16] = COLOR_HEX_TO_FLOAT(0xC3A0E0, 1.0f);
static float ozone_border_1_twilight_zone[16] = COLOR_HEX_TO_FLOAT(0x9B61CC, 1.0f);
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);
ozone_theme_t ozone_theme_light = {
COLOR_HEX_TO_FLOAT(0xEBEBEB, 1.00),
@ -489,6 +520,43 @@ ozone_theme_t ozone_theme_twilight_zone = {
"twilight_zone" /* name */
};
ozone_theme_t ozone_theme_dracula = {
/* Background color */
COLOR_HEX_TO_FLOAT(0x282A36, 1.0f), /* background */
ozone_background_libretro_running_dracula, /* background_libretro_running */
/* Float colors for quads and icons */
COLOR_HEX_TO_FLOAT(0x44475A, 1.0f), /* header_footer_separator */
COLOR_HEX_TO_FLOAT(0xF8F8F2, 1.0f), /* text */
COLOR_HEX_TO_FLOAT(0x44475A, 1.0f), /* selection */
COLOR_HEX_TO_FLOAT(0xBD93F9, 1.0f), /* selection_border */
COLOR_HEX_TO_FLOAT(0x44475A, 1.0f), /* entries_border */
COLOR_HEX_TO_FLOAT(0xF8F8F2, 1.0f), /* entries_icon */
COLOR_HEX_TO_FLOAT(0xF8F8F2, 1.0f), /* text_selected */
COLOR_HEX_TO_FLOAT(0x6272A4, 1.0f), /* message_background */
/* RGBA colors for text */
0xF8F8F2FF, /* text_rgba */
0xFF79C6FF, /* text_selected_rgba */
0xBD93F9FF, /* text_sublabel_rgba */
/* Screensaver 'tint' (RGB24) */
0xF8F8F2, /* screensaver_tint */
/* Sidebar color */
ozone_sidebar_background_dracula, /* sidebar_background */
ozone_sidebar_gradient_top_dracula, /* sidebar_top_gradient */
ozone_sidebar_gradient_bottom_dracula, /* sidebar_bottom_gradient */
/* Fancy cursor colors */
ozone_border_0_dracula, /* cursor_border_0 */
ozone_border_1_dracula, /* cursor_border_1 */
{0}, /* textures */
"dracula" /* name */
};
ozone_theme_t *ozone_themes[] = {
&ozone_theme_light,
@ -497,7 +565,8 @@ ozone_theme_t *ozone_themes[] = {
&ozone_theme_gruvbox_dark,
&ozone_theme_boysenberry,
&ozone_theme_hacking_the_kernel,
&ozone_theme_twilight_zone
&ozone_theme_twilight_zone,
&ozone_theme_dracula
};
@ -540,6 +609,9 @@ void ozone_set_color_theme(ozone_handle_t *ozone, unsigned color_theme)
case 6:
theme = &ozone_theme_twilight_zone;
break;
case 7:
theme = &ozone_theme_dracula;
break;
default:
break;
}

View File

@ -67,6 +67,7 @@ extern ozone_theme_t ozone_theme_gruvbox_dark;
extern ozone_theme_t ozone_theme_boysenberry;
extern ozone_theme_t ozone_theme_hacking_the_kernel;
extern ozone_theme_t ozone_theme_twilight_zone;
extern ozone_theme_t ozone_theme_dracula;
extern ozone_theme_t *ozone_themes[];

View File

@ -4667,6 +4667,11 @@ static void setting_get_string_representation_uint_ozone_menu_color_theme(
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_TWILIGHT_ZONE), len);
break;
case 7:
strlcpy(s,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA), len);
break;
case 0:
default:
strlcpy(s,
@ -15849,7 +15854,7 @@ static bool setting_append_list(
(*list)[list_info->index - 1].action_ok = &setting_action_ok_uint;
(*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_uint_ozone_menu_color_theme;
menu_settings_list_current_add_range(list, list_info, 0, 6, 1, true, true);
menu_settings_list_current_add_range(list, list_info, 0, 7, 1, true, true);
(*list)[list_info->index - 1].ui_type = ST_UI_TYPE_UINT_COMBOBOX;
CONFIG_BOOL(

View File

@ -598,6 +598,7 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BOYSENBERRY,
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_XMB_ICON_THEME_MONOCHROME,
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_INVERTED,