Add menu startup page option (#18175)

Author: sonninnos

config.def.h

@@ -1664,6 +1664,7 @@
 #define DEFAULT_MENU_TIMEDATE_STYLE          MENU_TIMEDATE_STYLE_DDMM_HM
 #define DEFAULT_MENU_TIMEDATE_DATE_SEPARATOR MENU_TIMEDATE_DATE_SEPARATOR_HYPHEN
 #define DEFAULT_MENU_REMEMBER_SELECTION      MENU_REMEMBER_SELECTION_ALWAYS
+#define DEFAULT_MENU_STARTUP_PAGE            MENU_STARTUP_PAGE_MAIN_MENU
 #endif
 
 #define DEFAULT_XMB_VERTICAL_THUMBNAILS false

configuration.c

@@ -2423,6 +2423,7 @@ static struct config_uint_setting *populate_settings_uint(
 #if defined(HAVE_XMB) || defined(HAVE_OZONE)
    SETTING_UINT("menu_remember_selection",       &settings->uints.menu_remember_selection, true, DEFAULT_MENU_REMEMBER_SELECTION, false);
 #endif
+   SETTING_UINT("menu_startup_page",             &settings->uints.menu_startup_page, true, DEFAULT_MENU_STARTUP_PAGE, false);
 #ifdef HAVE_RGUI
    SETTING_UINT("rgui_menu_color_theme",         &settings->uints.menu_rgui_color_theme, true, DEFAULT_RGUI_COLOR_THEME, false);
    SETTING_UINT("rgui_thumbnail_downscaler",     &settings->uints.menu_rgui_thumbnail_downscaler, true, DEFAULT_RGUI_THUMBNAIL_DOWNSCALER, false);

configuration.h

@@ -322,6 +322,7 @@ typedef struct settings
       unsigned menu_screensaver_timeout;
       unsigned menu_screensaver_animation;
       unsigned menu_remember_selection;
+      unsigned menu_startup_page;
 
       unsigned playlist_entry_remove_enable;
       unsigned playlist_show_inline_core_name;

intl/msg_hash_lbl.h

@@ -4032,6 +4032,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_MENU_REMEMBER_SELECTION,
    "menu_remember_selection"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_MENU_STARTUP_PAGE,
+   "menu_startup_page"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_UI_COMPANION_ENABLE,
    "ui_companion_enable"

intl/msg_hash_us.h

@@ -7173,6 +7173,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_MENU_REMEMBER_SELECTION_MAIN,
    "Only for Main Menu and Settings"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_MENU_STARTUP_PAGE,
+   "Startup Page"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_MENU_STARTUP_PAGE,
+   "Initial menu page on startup."
+   )
 
 /* Settings > AI Service */
 

menu/cbs/menu_cbs_sublabel.c

@@ -842,6 +842,7 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_screensaver_animation_speed, ME
 #if defined(HAVE_XMB) || defined(HAVE_OZONE)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_remember_selection,       MENU_ENUM_SUBLABEL_MENU_REMEMBER_SELECTION)
 #endif
+DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_startup_page,             MENU_ENUM_SUBLABEL_MENU_STARTUP_PAGE)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_driver,                  MENU_ENUM_SUBLABEL_VIDEO_DRIVER)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_audio_driver,                  MENU_ENUM_SUBLABEL_AUDIO_DRIVER)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_driver,                  MENU_ENUM_SUBLABEL_INPUT_DRIVER)
@@ -4071,6 +4072,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_remember_selection);
             break;
 #endif
+         case MENU_ENUM_LABEL_MENU_STARTUP_PAGE:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_startup_page);
+            break;
          case MENU_ENUM_LABEL_MENU_INPUT_SWAP_OK_CANCEL:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_swap_ok_cancel);
             break;

menu/drivers/ozone.c

@@ -589,10 +589,9 @@ struct ozone_handle
       float scroll_y;
       float scroll_y_sidebar;
 
+      float alpha;
       float list_alpha;
-
       float messagebox_alpha;
-
       float sidebar_text_alpha;
       float thumbnail_bar_position;
 
@@ -3518,6 +3517,8 @@ static void ozone_draw_sidebar(
    if (dispctx && dispctx->blend_begin)
       dispctx->blend_begin(userdata);
 
+   text_alpha *= ozone->animations.alpha;
+
    for (i = 0; i < (unsigned)(ozone->system_tab_end + 1); i++)
    {
       float *col                     = NULL;
@@ -3527,6 +3528,8 @@ static void ozone_draw_sidebar(
       if (!(col = selected ? ozone->theme->text_selected : ozone->theme->entries_icon))
          col = ozone->pure_white;
 
+      gfx_display_set_alpha(col, ozone->animations.alpha);
+
       /* Icon */
       ozone_draw_icon(
             p_disp,
@@ -3657,6 +3660,8 @@ static void ozone_draw_sidebar(
          if (!(col = (selected ? ozone->theme->text_selected : ozone->theme->entries_icon)))
             col = ozone->pure_white;
 
+         gfx_display_set_alpha(col, ozone->animations.alpha);
+
          /* Icon */
          ozone_draw_icon(
                p_disp,
@@ -3763,11 +3768,6 @@ static bool ozone_is_main_menu_playlist(void *userdata)
    ozone_handle_t *ozone      = (ozone_handle_t*)userdata;
    menu_entry_t entry;
 
-   if (     (ozone->depth != 3)
-         || (ozone->flags & OZONE_FLAG_IS_DB_MANAGER_LIST)
-         || (ozone->flags & OZONE_FLAG_IS_FILE_LIST))
-      return false;
-
    MENU_ENTRY_INITIALIZE(entry);
    menu_entry_get(&entry, 0, 0, NULL, true);
    return entry.type == FILE_TYPE_RPL_ENTRY;
@@ -4069,15 +4069,15 @@ static void ozone_sidebar_update_collapse(ozone_handle_t *ozone,
    if (ozone_get_horizontal_selection_type(ozone) == MENU_EXPLORE_TAB)
       is_playlist = true;
 
-   /* Playlists under "Main Menu" don't need sidebar animations */
-   if (is_playlist && ozone->depth > 2)
-      goto end;
+   /* Do not animate sidebar above first depth level */
+   if (ozone->depth > 1)
+      allow_animation = false;
 
    /* To collapse or not to collapse */
    collapse = ozone_want_collapse(ozone, ozone_collapse_sidebar, is_playlist);
 
    /* Skip if already at wanted state */
-   if (    (collapse  && ozone->sidebar_collapsed)
+   if (    ( collapse &&  ozone->sidebar_collapsed)
         || (!collapse && !ozone->sidebar_collapsed))
       goto end;
 
@@ -4112,9 +4112,7 @@ static void ozone_sidebar_update_collapse(ozone_handle_t *ozone,
    {
       if (allow_animation)
       {
-         ozone->sidebar_collapsed = false;
-
-         entry.cb = NULL;
+         entry.cb             = NULL;
 
          /* Text alpha */
          entry.subject        = &ozone->animations.sidebar_text_alpha;
@@ -4127,6 +4125,8 @@ static void ozone_sidebar_update_collapse(ozone_handle_t *ozone,
          entry.target_value   = ozone->dimensions.sidebar_width_normal;
 
          gfx_animation_push(&entry);
+
+         ozone->sidebar_collapsed               = false;
       }
       else
       {
@@ -5735,6 +5735,7 @@ static void ozone_draw_entries(
    }
 
    x_offset       += (int)sidebar_offset;
+   alpha          *= ozone->animations.alpha;
    alpha_uint32    = (uint32_t)(alpha * 255.0f);
 
    /* Borders layer */
@@ -5920,7 +5921,7 @@ static void ozone_draw_entries(
       if (use_smooth_ticker)
       {
          ticker_smooth.selected    = entry_selected && (!(ozone->flags & OZONE_FLAG_CURSOR_IN_SIDEBAR));
-         ticker_smooth.field_width = entry_width - entry_padding - ozone->dimensions.entry_icon_padding * 6;
+         ticker_smooth.field_width = entry_width - ozone->dimensions.entry_icon_padding * 6;
          ticker_smooth.src_str     = entry_rich_label;
          ticker_smooth.dst_str     = rich_label;
          ticker_smooth.dst_str_len = sizeof(rich_label);
@@ -5932,7 +5933,7 @@ static void ozone_draw_entries(
          ticker.s        = rich_label;
          ticker.str      = entry_rich_label;
          ticker.selected = entry_selected && (!(ozone->flags & OZONE_FLAG_CURSOR_IN_SIDEBAR));
-         ticker.len      = (entry_width - entry_padding - ozone->dimensions.entry_icon_padding) / ozone->fonts.entries_label.glyph_width;
+         ticker.len      = (entry_width - ozone->dimensions.entry_icon_padding * 6) / ozone->fonts.entries_label.glyph_width;
 
          gfx_animation_ticker(&ticker);
       }
@@ -6033,7 +6034,19 @@ static void ozone_draw_entries(
                if (pl_entry
                      && !string_is_empty(pl_entry->db_name)
                      && (db_node = RHMAP_GET_STR(ozone->playlist_db_node_map, pl_entry->db_name)))
-                  texture = db_node->content_icon;
+               {
+                  switch (show_history_icons)
+                  {
+                     case PLAYLIST_SHOW_HISTORY_ICONS_MAIN:
+                        texture = db_node->icon;
+                        break;
+                     case PLAYLIST_SHOW_HISTORY_ICONS_CONTENT:
+                        texture = db_node->content_icon;
+                        break;
+                     default:
+                        break;
+                  }
+               }
             }
             else if (ozone->depth == 2 && entry.type == FILE_TYPE_PLAYLIST_COLLECTION)
             {
@@ -9697,6 +9710,7 @@ static void ozone_context_reset(void *data, bool is_threaded)
       ozone->animations.cursor_alpha      = 1.0f;
       ozone->animations.scroll_y          = 0.0f;
       ozone->animations.list_alpha        = 1.0f;
+      ozone->animations.alpha             = 1.0f;
 
       /* Thumbnails */
       ozone_update_thumbnail_image(ozone);
@@ -10517,8 +10531,7 @@ static void ozone_render(void *data,
                      menu_st->selection_ptr = i;
 
                      /* If this is a playlist, must update thumbnails */
-                     if (    ((ozone->flags & OZONE_FLAG_IS_PLAYLIST)
-                           && (ozone->depth == 1 || ozone->depth == 3))
+                     if (     (ozone->flags & OZONE_FLAG_IS_PLAYLIST)
                            || (ozone->flags & OZONE_FLAG_IS_EXPLORE_LIST))
                      {
                         ozone->flags &= ~OZONE_FLAG_SKIP_THUMBNAIL_RESET;
@@ -10555,8 +10568,7 @@ static void ozone_render(void *data,
                               settings->uints.menu_remember_selection);
                   }
                   /* If this is a playlist, must update thumbnails */
-                  else if ((ozone->flags & OZONE_FLAG_IS_PLAYLIST)
-                        && (ozone->depth == 1 || ozone->depth == 3))
+                  else if (ozone->flags & OZONE_FLAG_IS_PLAYLIST)
                   {
                      ozone_set_thumbnail_content(ozone, "");
                      ozone_update_thumbnail_image(ozone);
@@ -10738,6 +10750,8 @@ static void ozone_draw_header(
    if (header_margin < header_margin_min)
       header_margin = header_margin_min;
 
+   gfx_display_set_alpha(col, ozone->animations.alpha);
+
    /* Initial ticker configuration */
    if (use_smooth_ticker)
    {
@@ -11774,8 +11788,7 @@ static void ozone_selection_changed(ozone_handle_t *ozone, bool allow_animation)
          bool update_thumbnails = false;
 
          /* Playlist updates */
-         if (     (ozone->flags & OZONE_FLAG_IS_PLAYLIST)
-               && (ozone->depth == 1 || ozone->depth == 3))
+         if (ozone->flags & OZONE_FLAG_IS_PLAYLIST)
          {
             ozone_set_thumbnail_content(ozone, "");
             update_thumbnails = true;
@@ -12014,6 +12027,8 @@ static void ozone_frame(void *data, video_frame_info_t *video_info)
    else
       background_color = ozone->theme->background;
 
+   gfx_display_set_alpha(background_color, ozone->animations.alpha);
+
    gfx_display_draw_quad(p_disp,
          userdata,
          video_width,
@@ -12667,7 +12682,7 @@ static void ozone_populate_entries(
     * and savestate slots */
    if (
             (   (ozone->flags  & OZONE_FLAG_WANT_THUMBNAIL_BAR))
-         && (  ((ozone->flags  & OZONE_FLAG_IS_PLAYLIST) && (ozone->depth == 1 || ozone->depth == 3))
+         && (   (ozone->flags  & OZONE_FLAG_IS_PLAYLIST)
             || ((ozone->flags  & OZONE_FLAG_IS_DB_MANAGER_LIST) && (ozone->depth >= 4))
             ||  (ozone->flags  & OZONE_FLAG_IS_EXPLORE_LIST)
             ||  (ozone->flags  & OZONE_FLAG_IS_FILE_LIST)
@@ -12700,6 +12715,23 @@ static void ozone_toggle(void *userdata, bool menu_on)
    if (!ozone)
       return;
 
+   /* Fade in animation */
+   if (menu_on)
+   {
+      struct gfx_animation_ctx_entry entry;
+
+      ozone->animations.alpha      = 0.0f;
+
+      entry.cb                     = NULL;
+      entry.duration               = ANIMATION_PUSH_ENTRY_DURATION * 1.25f;
+      entry.easing_enum            = OZONE_EASING_ALPHA;
+      entry.subject                = &ozone->animations.alpha;
+      entry.tag                    = (uintptr_t)NULL;
+      entry.target_value           = 1.0f;
+
+      gfx_animation_push(&entry);
+   }
+
    /* Have to reset this, otherwise savestate
     * thumbnail won't update after selecting
     * 'save state' option */
@@ -13052,7 +13084,6 @@ static int ozone_pointer_up(void *userdata,
                /* If this is a playlist and the selection
                 * has changed, must update thumbnails */
                else if (   (ozone->flags & OZONE_FLAG_IS_PLAYLIST)
-                        && (ozone->depth == 1)
                         && (ptr != selection))
                {
                   ozone_set_thumbnail_content(ozone, "");