From 8346c4eeff201384cc7d4b34dca5ec4b61595a7a Mon Sep 17 00:00:00 2001 From: SecularSteve <33793273+SecularSteve@users.noreply.github.com> Date: Thu, 20 May 2021 14:00:17 +0200 Subject: [PATCH 01/10] Added English hash for "Ocean Blue" --- intl/msg_hash_us.h | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 490acda296..4501a860ce 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -5293,14 +5293,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED, "Last Played:" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_PLAYLIST_SHOW_ENTRY_IDX, - "Show Playlist Entry Index" - ) -MSG_HASH( - MENU_ENUM_SUBLABEL_PLAYLIST_SHOW_ENTRY_IDX, - "Show entry numbers when viewing playlists. Display format is dependent upon the currently selected menu driver." - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_RUNTIME_TYPE, "Playlist Sub-Label Runtime" @@ -6151,10 +6143,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_CONTENT_INFO_PATH, "File Path" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_CONTENT_INFO_ENTRY_IDX, - "Entry: %lu/%lu" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CONTENT_INFO_CORE_NAME, "Core" @@ -8982,6 +8970,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" From a1ff509276fe63ddf848656a4f8bb0644185e6a7 Mon Sep 17 00:00:00 2001 From: SecularSteve <33793273+SecularSteve@users.noreply.github.com> Date: Thu, 20 May 2021 14:10:13 +0200 Subject: [PATCH 02/10] Added new "Ocean Blue" theme (along with a small tutorial) I also sorted all of floats of the other themes in order. --- menu/drivers/ozone/ozone_theme.c | 186 +++++++++++++++++++++---------- 1 file changed, 129 insertions(+), 57 deletions(-) diff --git a/menu/drivers/ozone/ozone_theme.c b/menu/drivers/ozone/ozone_theme.c index 5d318b15af..5f8870d898 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.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_sidebar_gradient_bottom_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_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(0x087D8A, 1.0f), /* header_footer_separator */ + COLOR_HEX_TO_FLOAT(0x087D8A, 1.0f), /* text */ + COLOR_HEX_TO_FLOAT(0x17E8FF, 1.0f), /* selection */ + COLOR_HEX_TO_FLOAT(0xFFFFFF, 0.5f), /* selection_border */ + COLOR_HEX_TO_FLOAT(0x076A75, 1.0f), /* entries_border */ + COLOR_HEX_TO_FLOAT(0x087D8A, 1.0f), /* entries_icon */ + COLOR_HEX_TO_FLOAT(0x000000, 1.0f), /* text_selected */ + COLOR_HEX_TO_FLOAT(0x0A9BAB, 1.0f), /* message_background */ + + 0x087D8AFF, /* text_rgba */ + 0x000000FF, /* text_selected_rgba */ + 0x076A75FF, /* 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; } From 0bd49c59c6e388554bf522f048b019496a7f6bcc Mon Sep 17 00:00:00 2001 From: SecularSteve <33793273+SecularSteve@users.noreply.github.com> Date: Thu, 20 May 2021 14:11:00 +0200 Subject: [PATCH 03/10] Added new "Ocean Blue" theme --- menu/drivers/ozone/ozone_theme.h | 1 + 1 file changed, 1 insertion(+) 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[]; From 32f68e81d6664ada416ddda86060a84bfed9b93c Mon Sep 17 00:00:00 2001 From: SecularSteve <33793273+SecularSteve@users.noreply.github.com> Date: Thu, 20 May 2021 14:13:58 +0200 Subject: [PATCH 04/10] Added new "Ocean Blue" theme --- menu/menu_setting.c | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index bd0420dd94..f14c09752d 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -4668,6 +4668,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, @@ -7414,7 +7419,12 @@ static void general_write_handler(rarch_setting_t *setting) } break; case MENU_ENUM_LABEL_INPUT_MAX_USERS: - command_event(CMD_EVENT_CONTROLLER_INIT, NULL); + { + bool refresh = false; + command_event(CMD_EVENT_CONTROLLER_INIT, NULL); + menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh); + menu_driver_ctl(RARCH_MENU_CTL_SET_PREVENT_POPULATE, NULL); + } break; case MENU_ENUM_LABEL_INPUT_PLAYER1_JOYPAD_INDEX: case MENU_ENUM_LABEL_INPUT_PLAYER2_JOYPAD_INDEX: @@ -12145,9 +12155,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler); - (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; - (*list)[list_info->index - 1].action_left = &setting_uint_action_left_with_refresh; - (*list)[list_info->index - 1].action_right = &setting_uint_action_right_with_refresh; + (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_max_users; (*list)[list_info->index - 1].offset_by = 1; @@ -17646,27 +17654,6 @@ static bool setting_append_list( (*list)[list_info->index - 1].action_left = setting_bool_action_left_with_refresh; (*list)[list_info->index - 1].action_right = setting_bool_action_right_with_refresh; - /* Playlist entry index display is currently - * supported only by Ozone */ - if (string_is_equal(settings->arrays.menu_driver, "ozone")) - { - CONFIG_BOOL( - list, list_info, - &settings->bools.playlist_show_entry_idx, - MENU_ENUM_LABEL_PLAYLIST_SHOW_ENTRY_IDX, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SHOW_ENTRY_IDX, - DEFAULT_PLAYLIST_SHOW_ENTRY_IDX, - MENU_ENUM_LABEL_VALUE_OFF, - MENU_ENUM_LABEL_VALUE_ON, - &group_info, - &subgroup_info, - parent_group, - general_write_handler, - general_read_handler, - SD_FLAG_NONE - ); - } - CONFIG_UINT( list, list_info, &settings->uints.playlist_sublabel_runtime_type, From ce474040afcabcf148c36ecea2858a363f8117d4 Mon Sep 17 00:00:00 2001 From: SecularSteve <33793273+SecularSteve@users.noreply.github.com> Date: Thu, 20 May 2021 14:15:10 +0200 Subject: [PATCH 05/10] Added new "Ocean Blue" Ozone theme --- msg_hash.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/msg_hash.h b/msg_hash.h index 4e140e250f..3edb336f8d 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -600,6 +600,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, @@ -2022,7 +2023,6 @@ enum msg_hash_enums /* Content information settings */ MENU_LABEL(CONTENT_INFO_LABEL), MENU_LABEL(CONTENT_INFO_PATH), - MENU_LABEL(CONTENT_INFO_ENTRY_IDX), MENU_LABEL(CONTENT_INFO_CORE_NAME), MENU_LABEL(CONTENT_INFO_DATABASE), MENU_LABEL(CONTENT_INFO_RUNTIME), @@ -3097,7 +3097,6 @@ enum msg_hash_enums MENU_LABEL(PLAYLIST_SHOW_INLINE_CORE_NAME), MENU_LABEL(PLAYLIST_SORT_ALPHABETICAL), MENU_LABEL(PLAYLIST_SHOW_SUBLABELS), - MENU_LABEL(PLAYLIST_SHOW_ENTRY_IDX), MENU_LABEL(PLAYLIST_FUZZY_ARCHIVE_MATCH), MENU_LABEL(PLAYLIST_SUBLABEL_RUNTIME_TYPE), MENU_LABEL(PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE), From a6f8355c6f27d907e9b8ac2f48b78b4333886f44 Mon Sep 17 00:00:00 2001 From: SecularSteve <33793273+SecularSteve@users.noreply.github.com> Date: Thu, 20 May 2021 14:41:45 +0200 Subject: [PATCH 06/10] small fixes --- intl/msg_hash_us.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 4501a860ce..0f6b3351c1 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -5293,6 +5293,14 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED, "Last Played:" ) + MSG_HASH( + MENU_ENUM_LABEL_VALUE_PLAYLIST_SHOW_ENTRY_IDX, + "Show Playlist Entry Index" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_PLAYLIST_SHOW_ENTRY_IDX, + "Show entry numbers when viewing playlists. Display format is dependent upon the currently selected menu driver." + ) MSG_HASH( MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_RUNTIME_TYPE, "Playlist Sub-Label Runtime" @@ -6143,6 +6151,10 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_CONTENT_INFO_PATH, "File Path" ) + MSG_HASH( + MENU_ENUM_LABEL_VALUE_CONTENT_INFO_ENTRY_IDX, + "Entry: %lu/%lu" + ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CONTENT_INFO_CORE_NAME, "Core" From b355217e6d66261e83deec5f72887f3d4e465e2f Mon Sep 17 00:00:00 2001 From: SecularSteve <33793273+SecularSteve@users.noreply.github.com> Date: Thu, 20 May 2021 14:45:21 +0200 Subject: [PATCH 07/10] small fixes --- menu/menu_setting.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index f14c09752d..6e864362b5 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -7419,12 +7419,7 @@ static void general_write_handler(rarch_setting_t *setting) } break; case MENU_ENUM_LABEL_INPUT_MAX_USERS: - { - bool refresh = false; - command_event(CMD_EVENT_CONTROLLER_INIT, NULL); - menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh); - menu_driver_ctl(RARCH_MENU_CTL_SET_PREVENT_POPULATE, 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: @@ -12155,7 +12150,9 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler); - (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; + (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; + (*list)[list_info->index - 1].action_left = &setting_uint_action_left_with_refresh; + (*list)[list_info->index - 1].action_right = &setting_uint_action_right_with_refresh; (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_max_users; (*list)[list_info->index - 1].offset_by = 1; @@ -17654,6 +17651,27 @@ static bool setting_append_list( (*list)[list_info->index - 1].action_left = setting_bool_action_left_with_refresh; (*list)[list_info->index - 1].action_right = setting_bool_action_right_with_refresh; + /* Playlist entry index display is currently + * supported only by Ozone */ + if (string_is_equal(settings->arrays.menu_driver, "ozone")) + { + CONFIG_BOOL( + list, list_info, + &settings->bools.playlist_show_entry_idx, + MENU_ENUM_LABEL_PLAYLIST_SHOW_ENTRY_IDX, + MENU_ENUM_LABEL_VALUE_PLAYLIST_SHOW_ENTRY_IDX, + DEFAULT_PLAYLIST_SHOW_ENTRY_IDX, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE + ); + } + CONFIG_UINT( list, list_info, &settings->uints.playlist_sublabel_runtime_type, From d1300dbdb3fb0fc038b7ec72653dbf66023ff95f Mon Sep 17 00:00:00 2001 From: SecularSteve <33793273+SecularSteve@users.noreply.github.com> Date: Thu, 20 May 2021 14:46:39 +0200 Subject: [PATCH 08/10] small fixes --- msg_hash.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/msg_hash.h b/msg_hash.h index 3edb336f8d..b780bb1c40 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -2023,6 +2023,7 @@ enum msg_hash_enums /* Content information settings */ MENU_LABEL(CONTENT_INFO_LABEL), MENU_LABEL(CONTENT_INFO_PATH), + MENU_LABEL(CONTENT_INFO_ENTRY_IDX), MENU_LABEL(CONTENT_INFO_CORE_NAME), MENU_LABEL(CONTENT_INFO_DATABASE), MENU_LABEL(CONTENT_INFO_RUNTIME), @@ -3097,6 +3098,7 @@ enum msg_hash_enums MENU_LABEL(PLAYLIST_SHOW_INLINE_CORE_NAME), MENU_LABEL(PLAYLIST_SORT_ALPHABETICAL), MENU_LABEL(PLAYLIST_SHOW_SUBLABELS), + MENU_LABEL(PLAYLIST_SHOW_ENTRY_IDX), MENU_LABEL(PLAYLIST_FUZZY_ARCHIVE_MATCH), MENU_LABEL(PLAYLIST_SUBLABEL_RUNTIME_TYPE), MENU_LABEL(PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE), From d75e53a11a62d06e66d94551f210231982eb1cd7 Mon Sep 17 00:00:00 2001 From: SecularSteve <33793273+SecularSteve@users.noreply.github.com> Date: Sun, 23 May 2021 13:47:46 +0200 Subject: [PATCH 09/10] Added new "Ocean Blue" theme for Ozone --- menu/menu_defines.h | 1 + 1 file changed, 1 insertion(+) diff --git a/menu/menu_defines.h b/menu/menu_defines.h index a526c15b19..52e3d2fcdc 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 }; From c42431551012b988e97f65350d39229541bdd6c4 Mon Sep 17 00:00:00 2001 From: SecularSteve <33793273+SecularSteve@users.noreply.github.com> Date: Sun, 23 May 2021 22:44:42 +0200 Subject: [PATCH 10/10] Made the text, icons and borders darker, fixed the sidebar gradient. --- menu/drivers/ozone/ozone_theme.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/menu/drivers/ozone/ozone_theme.c b/menu/drivers/ozone/ozone_theme.c index 5f8870d898..041516880e 100644 --- a/menu/drivers/ozone/ozone_theme.c +++ b/menu/drivers/ozone/ozone_theme.c @@ -266,17 +266,17 @@ static float ozone_sidebar_background_ocean_blue[16] = { }; static float ozone_sidebar_gradient_top_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, + 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.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, + 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); @@ -597,18 +597,18 @@ 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(0x087D8A, 1.0f), /* header_footer_separator */ - COLOR_HEX_TO_FLOAT(0x087D8A, 1.0f), /* text */ + 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(0x076A75, 1.0f), /* entries_border */ - COLOR_HEX_TO_FLOAT(0x087D8A, 1.0f), /* entries_icon */ + 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 */ - 0x087D8AFF, /* text_rgba */ + 0x065E69FF, /* text_rgba */ 0x000000FF, /* text_selected_rgba */ - 0x076A75FF, /* text_sublabel_rgba */ + 0x054C54FF, /* text_sublabel_rgba */ /* Screensaver 'tint' (RGB24) */ 0xAEE5EB, /* screensaver_tint */