diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index ed9b3ffdcc..fac070632d 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -5363,7 +5363,7 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED, "Last Played:" ) -MSG_HASH( + MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_SHOW_ENTRY_IDX, "Show Playlist Entry Index" ) @@ -6221,7 +6221,7 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_CONTENT_INFO_PATH, "File Path" ) -MSG_HASH( + MSG_HASH( MENU_ENUM_LABEL_VALUE_CONTENT_INFO_ENTRY_IDX, "Entry: %lu/%lu" ) @@ -9076,6 +9076,10 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA, "Dracula" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_OCEAN_BLUE, + "Ocean Blue" + ) MSG_HASH( MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE, "Second Thumbnail" diff --git a/menu/drivers/ozone/ozone_theme.c b/menu/drivers/ozone/ozone_theme.c index 5d318b15af..041516880e 100644 --- a/menu/drivers/ozone/ozone_theme.c +++ b/menu/drivers/ozone/ozone_theme.c @@ -21,6 +21,26 @@ #include "ozone_theme.h" #include "ozone_display.h" +/* The colours use the 4x4 RGBA format with a 0-1 spectrum instead of the typical 0-255 for the RGB colours. + * It's recommended to divide the colours by 255 in a regular spectrum first. + * The A at the end represents the alpha/transparency. + * The RGBA colour of each of the 4 corners is determined clockwise (Upper-Left, Upper-Right, Bottom-Right, Bottom-Left) + */ + +static float ozone_background_libretro_running_light[16] = { + 0.690, 0.690, 0.690, 0.75, + 0.690, 0.690, 0.690, 0.75, + 0.922, 0.922, 0.922, 1.0, + 0.922, 0.922, 0.922, 1.0 +}; + +static float ozone_sidebar_background_light[16] = { + 0.94, 0.94, 0.94, 1.00, + 0.94, 0.94, 0.94, 1.00, + 0.94, 0.94, 0.94, 1.00, + 0.94, 0.94, 0.94, 1.00, +}; + static float ozone_sidebar_gradient_top_light[16] = { 0.94, 0.94, 0.94, 1.00, 0.94, 0.94, 0.94, 1.00, @@ -35,6 +55,20 @@ static float ozone_sidebar_gradient_bottom_light[16] = { 0.94, 0.94, 0.94, 1.00, }; +static float ozone_background_libretro_running_dark[16] = { + 0.176, 0.176, 0.176, 0.75, + 0.176, 0.176, 0.176, 0.75, + 0.178, 0.178, 0.178, 1.0, + 0.178, 0.178, 0.178, 1.0, +}; + +static float ozone_sidebar_background_dark[16] = { + 0.2, 0.2, 0.2, 1.00, + 0.2, 0.2, 0.2, 1.00, + 0.2, 0.2, 0.2, 1.00, + 0.2, 0.2, 0.2, 1.00, +}; + static float ozone_sidebar_gradient_top_dark[16] = { 0.2, 0.2, 0.2, 1.00, 0.2, 0.2, 0.2, 1.00, @@ -49,6 +83,20 @@ static float ozone_sidebar_gradient_bottom_dark[16] = { 0.2, 0.2, 0.2, 1.00, }; +static float ozone_background_libretro_running_nord[16] = { + 0.1803922f, 0.2039216f, 0.2509804f, 0.75f, + 0.1803922f, 0.2039216f, 0.2509804f, 0.75f, + 0.1803922f, 0.2039216f, 0.2509804f, 1.0f, + 0.1803922f, 0.2039216f, 0.2509804f, 1.0f, +}; + +static float ozone_sidebar_background_nord[16] = { + 0.2078431f, 0.2352941f, 0.2901961f, 1.0f, + 0.2078431f, 0.2352941f, 0.2901961f, 1.0f, + 0.2078431f, 0.2352941f, 0.2901961f, 1.0f, + 0.2078431f, 0.2352941f, 0.2901961f, 1.0f, +}; + static float ozone_sidebar_gradient_top_nord[16] = { 0.2078431f, 0.2352941f, 0.2901961f, 1.0f, 0.2078431f, 0.2352941f, 0.2901961f, 1.0f, @@ -63,6 +111,20 @@ static float ozone_sidebar_gradient_bottom_nord[16] = { 0.2078431f, 0.2352941f, 0.2901961f, 1.0f, }; +static float ozone_background_libretro_running_gruvbox_dark[16] = { + 0.1568627f, 0.1568627f, 0.1568627f, 0.75f, + 0.1568627f, 0.1568627f, 0.1568627f, 0.75f, + 0.1568627f, 0.1568627f, 0.1568627f, 1.0f, + 0.1568627f, 0.1568627f, 0.1568627f, 1.0f, +}; + +static float ozone_sidebar_background_gruvbox_dark[16] = { + 0.1960784f, 0.1882353f, 0.1843137f, 1.0f, + 0.1960784f, 0.1882353f, 0.1843137f, 1.0f, + 0.1960784f, 0.1882353f, 0.1843137f, 1.0f, + 0.1960784f, 0.1882353f, 0.1843137f, 1.0f, +}; + static float ozone_sidebar_gradient_top_gruvbox_dark[16] = { 0.1960784f, 0.1882353f, 0.1843137f, 1.0f, 0.1960784f, 0.1882353f, 0.1843137f, 1.0f, @@ -77,62 +139,6 @@ static float ozone_sidebar_gradient_bottom_gruvbox_dark[16] = { 0.1960784f, 0.1882353f, 0.1843137f, 1.0f, }; -static float ozone_sidebar_background_light[16] = { - 0.94, 0.94, 0.94, 1.00, - 0.94, 0.94, 0.94, 1.00, - 0.94, 0.94, 0.94, 1.00, - 0.94, 0.94, 0.94, 1.00, -}; - -static float ozone_sidebar_background_dark[16] = { - 0.2, 0.2, 0.2, 1.00, - 0.2, 0.2, 0.2, 1.00, - 0.2, 0.2, 0.2, 1.00, - 0.2, 0.2, 0.2, 1.00, -}; - -static float ozone_sidebar_background_nord[16] = { - 0.2078431f, 0.2352941f, 0.2901961f, 1.0f, - 0.2078431f, 0.2352941f, 0.2901961f, 1.0f, - 0.2078431f, 0.2352941f, 0.2901961f, 1.0f, - 0.2078431f, 0.2352941f, 0.2901961f, 1.0f, -}; - -static float ozone_sidebar_background_gruvbox_dark[16] = { - 0.1960784f, 0.1882353f, 0.1843137f, 1.0f, - 0.1960784f, 0.1882353f, 0.1843137f, 1.0f, - 0.1960784f, 0.1882353f, 0.1843137f, 1.0f, - 0.1960784f, 0.1882353f, 0.1843137f, 1.0f, -}; - -static float ozone_background_libretro_running_light[16] = { - 0.690, 0.690, 0.690, 0.75, - 0.690, 0.690, 0.690, 0.75, - 0.922, 0.922, 0.922, 1.0, - 0.922, 0.922, 0.922, 1.0 -}; - -static float ozone_background_libretro_running_dark[16] = { - 0.176, 0.176, 0.176, 0.75, - 0.176, 0.176, 0.176, 0.75, - 0.178, 0.178, 0.178, 1.0, - 0.178, 0.178, 0.178, 1.0, -}; - -static float ozone_background_libretro_running_nord[16] = { - 0.1803922f, 0.2039216f, 0.2509804f, 0.75f, - 0.1803922f, 0.2039216f, 0.2509804f, 0.75f, - 0.1803922f, 0.2039216f, 0.2509804f, 1.0f, - 0.1803922f, 0.2039216f, 0.2509804f, 1.0f, -}; - -static float ozone_background_libretro_running_gruvbox_dark[16] = { - 0.1568627f, 0.1568627f, 0.1568627f, 0.75f, - 0.1568627f, 0.1568627f, 0.1568627f, 0.75f, - 0.1568627f, 0.1568627f, 0.1568627f, 1.0f, - 0.1568627f, 0.1568627f, 0.1568627f, 1.0f, -}; - static float ozone_background_libretro_running_boysenberry[16] = { 0.27058823529, 0.09803921568, 0.14117647058, 0.75f, 0.27058823529, 0.09803921568, 0.14117647058, 0.75f, @@ -245,6 +251,33 @@ static float ozone_sidebar_gradient_bottom_dracula[16] = { 0.2666666, 0.2784314, 0.3529412, 1.0f, }; +static float ozone_background_libretro_running_ocean_blue[16] = { + 0.05, 0.79, 0.87, 0.75f, + 0.05, 0.79, 0.87, 0.75f, + 0.05, 0.79, 0.87, 0.75f, + 0.05, 0.79, 0.87, 0.75f +}; + +static float ozone_sidebar_background_ocean_blue[16] = { + 0.05, 0.79, 0.87, 1.0f, + 0.05, 0.79, 0.87, 1.0f, + 0.05, 0.79, 0.87, 1.0f, + 0.05, 0.79, 0.87, 1.0f, +}; + +static float ozone_sidebar_gradient_top_ocean_blue[16] = { + 0.04, 0.64, 0.71, 1.0f, + 0.04, 0.64, 0.71, 1.0f, + 0.05, 0.79, 0.87, 1.0f, + 0.05, 0.79, 0.87, 1.0f, +}; + +static float ozone_sidebar_gradient_bottom_ocean_blue[16] = { + 0.05, 0.79, 0.87, 1.0f, + 0.05, 0.79, 0.87, 1.0f, + 0.04, 0.64, 0.71, 1.0f, + 0.04, 0.64, 0.71, 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); @@ -270,6 +303,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_ocean_blue[16] = COLOR_HEX_TO_FLOAT(0x000000, 0); +static float ozone_border_1_ocean_blue[16] = COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.0f); + ozone_theme_t ozone_theme_light = { COLOR_HEX_TO_FLOAT(0xEBEBEB, 1.00), /* background */ @@ -557,6 +593,38 @@ ozone_theme_t ozone_theme_dracula = { "dracula" /* name */ }; +ozone_theme_t ozone_theme_ocean_blue = { + COLOR_HEX_TO_FLOAT(0x0DC9DE, 1.0f), /* background */ + ozone_background_libretro_running_ocean_blue, /* background_libretro_running */ + + COLOR_HEX_TO_FLOAT(0x065E69, 1.0f), /* header_footer_separator */ + COLOR_HEX_TO_FLOAT(0x065E69, 1.0f), /* text */ + COLOR_HEX_TO_FLOAT(0x17E8FF, 1.0f), /* selection */ + COLOR_HEX_TO_FLOAT(0xFFFFFF, 0.5f), /* selection_border */ + COLOR_HEX_TO_FLOAT(0x054C54, 1.0f), /* entries_border */ + COLOR_HEX_TO_FLOAT(0x065E69, 1.0f), /* entries_icon */ + COLOR_HEX_TO_FLOAT(0x000000, 1.0f), /* text_selected */ + COLOR_HEX_TO_FLOAT(0x0A9BAB, 1.0f), /* message_background */ + + 0x065E69FF, /* text_rgba */ + 0x000000FF, /* text_selected_rgba */ + 0x054C54FF, /* text_sublabel_rgba */ + + /* Screensaver 'tint' (RGB24) */ + 0xAEE5EB, /* screensaver_tint */ + + ozone_sidebar_background_ocean_blue, /* sidebar_background */ + ozone_sidebar_gradient_top_ocean_blue, /* sidebar_top_gradient */ + ozone_sidebar_gradient_bottom_ocean_blue, /* sidebar_bottom_gradient */ + + ozone_border_0_ocean_blue, /* cursor_border_0 */ + ozone_border_1_ocean_blue, /* cursor_border_1 */ + + {0}, /* textures */ + + "ocean_blue" /* name */ +}; + ozone_theme_t *ozone_themes[] = { &ozone_theme_light, @@ -566,7 +634,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_ocean_blue }; @@ -612,6 +681,9 @@ 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_OCEAN_BLUE: + theme = &ozone_theme_ocean_blue; + break; default: break; } diff --git a/menu/drivers/ozone/ozone_theme.h b/menu/drivers/ozone/ozone_theme.h index b55fdf178c..e85c03a708 100644 --- a/menu/drivers/ozone/ozone_theme.h +++ b/menu/drivers/ozone/ozone_theme.h @@ -68,6 +68,7 @@ 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_theme_ocean_blue; extern ozone_theme_t *ozone_themes[]; diff --git a/menu/menu_defines.h b/menu/menu_defines.h index e9698558c2..8aaafbe7ba 100644 --- a/menu/menu_defines.h +++ b/menu/menu_defines.h @@ -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_OCEAN_BLUE, OZONE_COLOR_THEME_LAST }; diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 36b8a27948..fb4d8e570a 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -4672,6 +4672,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_OCEAN_BLUE: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_OCEAN_BLUE), len); + break; case OZONE_COLOR_THEME_BASIC_WHITE: default: strlcpy(s, @@ -7589,7 +7594,7 @@ static void general_write_handler(rarch_setting_t *setting) } break; case MENU_ENUM_LABEL_INPUT_MAX_USERS: - command_event(CMD_EVENT_CONTROLLER_INIT, NULL); + command_event(CMD_EVENT_CONTROLLER_INIT, NULL); break; case MENU_ENUM_LABEL_INPUT_PLAYER1_JOYPAD_INDEX: case MENU_ENUM_LABEL_INPUT_PLAYER2_JOYPAD_INDEX: @@ -18037,7 +18042,7 @@ static bool setting_append_list( SD_FLAG_NONE ); } - + CONFIG_UINT( list, list_info, &settings->uints.playlist_sublabel_runtime_type, diff --git a/msg_hash.h b/msg_hash.h index 95bf05956c..a1047541ec 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -601,6 +601,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_OCEAN_BLUE, MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME, MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_INVERTED,