Add 'Single-Click Playlists' option (#18218)

Author: sonninnos

config.def.h

@@ -967,6 +967,7 @@
 
 #define DEFAULT_MENU_SWAP_OK_CANCEL_BUTTONS true
 #define DEFAULT_MENU_SWAP_SCROLL_BUTTONS false
+#define DEFAULT_MENU_SINGLECLICK_PLAYLISTS false
 #define DEFAULT_MENU_ALLOW_TABS_BACK true
 
 #if defined(WIIU)

configuration.c

@@ -2180,6 +2180,7 @@ static struct config_bool_setting *populate_settings_bool(
    SETTING_BOOL("all_users_control_menu",        &settings->bools.input_all_users_control_menu, true, DEFAULT_ALL_USERS_CONTROL_MENU, false);
    SETTING_BOOL("menu_swap_ok_cancel_buttons",   &settings->bools.input_menu_swap_ok_cancel_buttons, true, DEFAULT_MENU_SWAP_OK_CANCEL_BUTTONS, false);
    SETTING_BOOL("menu_swap_scroll_buttons",      &settings->bools.input_menu_swap_scroll_buttons, true, DEFAULT_MENU_SWAP_SCROLL_BUTTONS, false);
+   SETTING_BOOL("menu_singleclick_playlists",    &settings->bools.input_menu_singleclick_playlists, true, DEFAULT_MENU_SINGLECLICK_PLAYLISTS, false);
    SETTING_BOOL("menu_allow_tabs_back",          &settings->bools.input_menu_allow_tabs_back, true, DEFAULT_MENU_ALLOW_TABS_BACK, false);
 #endif
 #if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT)

configuration.h

@@ -719,6 +719,7 @@ typedef struct settings
       bool input_descriptor_label_show;
       bool input_descriptor_hide_unbound;
       bool input_all_users_control_menu;
+      bool input_menu_singleclick_playlists;
       bool input_menu_allow_tabs_back;
       bool input_menu_swap_ok_cancel_buttons;
       bool input_menu_swap_scroll_buttons;

intl/msg_hash_lbl.h

@@ -1834,6 +1834,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_INPUT_ALL_USERS_CONTROL_MENU,
    "all_users_control_menu"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_MENU_SINGLECLICK_PLAYLISTS,
+   "menu_singleclick_playlists"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_MENU_ALLOW_TABS_BACK,
    "menu_allow_tabs_back"

intl/msg_hash_us.h

@@ -3696,6 +3696,14 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_INPUT_ALL_USERS_CONTROL_MENU,
    "Allow any user to control the menu. If disabled, only User 1 can control the menu."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_MENU_SINGLECLICK_PLAYLISTS,
+   "Single-Click Playlists"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_MENU_SINGLECLICK_PLAYLISTS,
+   "Skip 'Run' menu when launching playlist entries. Press D-Pad while holding OK to access 'Run' menu."
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_MENU_ALLOW_TABS_BACK,
    "Allow Back From Tabs"

menu/cbs/menu_cbs_ok.c

@@ -5732,8 +5732,17 @@ int action_ok_close_content(const char *path, const char *label, unsigned type,
       menu_st->flags &= ~MENU_ST_FLAG_PREVENT_POPULATE;
    }
 
+   /* Single-click playlist return */
+   if (config_get_ptr()->bools.input_menu_singleclick_playlists)
+   {
+      size_t new_selection = menu_st->selection_ptr;
+      menu_entries_pop_stack(&new_selection, 0, 0);
+      menu_st->selection_ptr = new_selection;
+      menu_st->flags &= ~MENU_ST_FLAG_PREVENT_POPULATE;
+   }
+
    /* Try to reload last core if loaded manually */
-   menu_state_get_ptr()->flags |= MENU_ST_FLAG_PENDING_RELOAD_CORE;
+   menu_st->flags |= MENU_ST_FLAG_PENDING_RELOAD_CORE;
 
    return ret;
 }

menu/cbs/menu_cbs_sublabel.c

@@ -831,6 +831,7 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_auto_game_focus,         MENU_
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_swap_ok_cancel,          MENU_ENUM_SUBLABEL_MENU_INPUT_SWAP_OK_CANCEL)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_swap_scroll,             MENU_ENUM_SUBLABEL_MENU_INPUT_SWAP_SCROLL)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_all_users_control_menu,  MENU_ENUM_SUBLABEL_INPUT_ALL_USERS_CONTROL_MENU)
+DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_singleclick_playlists,    MENU_ENUM_SUBLABEL_MENU_SINGLECLICK_PLAYLISTS)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_allow_tabs_back,          MENU_ENUM_SUBLABEL_MENU_ALLOW_TABS_BACK)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_pause_libretro,                MENU_ENUM_SUBLABEL_PAUSE_LIBRETRO)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_savestate_resume,         MENU_ENUM_SUBLABEL_MENU_SAVESTATE_RESUME)
@@ -4083,6 +4084,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_MENU_INPUT_SWAP_SCROLL:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_swap_scroll);
             break;
+         case MENU_ENUM_LABEL_MENU_SINGLECLICK_PLAYLISTS:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_singleclick_playlists);
+            break;
          case MENU_ENUM_LABEL_MENU_ALLOW_TABS_BACK:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_allow_tabs_back);
             break;

menu/drivers/materialui.c

@@ -697,6 +697,7 @@ typedef struct materialui_handle
    float touch_feedback_alpha;
    int16_t pointer_start_x;
    int16_t pointer_start_y;
+   bool transition_alpha_lock;
 
    /* Colour theme parameters */
    enum materialui_color_theme color_theme;
@@ -7616,6 +7617,9 @@ static void materialui_render_fullscreen_thumbnails(materialui_handle_t *mui,
  * a transition animation is in process */
 static void materialui_colors_set_transition_alpha(materialui_handle_t *mui)
 {
+   if (mui->transition_alpha_lock)
+      mui->transition_alpha = 0.0f;
+
    if (mui->transition_alpha < 1.0f)
    {
       float alpha        = mui->transition_alpha;
@@ -7686,6 +7690,9 @@ static void materialui_colors_set_transition_alpha(materialui_handle_t *mui)
  * previously altered by a menu transition animation */
 static void materialui_colors_reset_transition_alpha(materialui_handle_t *mui)
 {
+   if (mui->transition_alpha_lock)
+      mui->transition_alpha = 0.0f;
+
    if (mui->transition_alpha < 1.0f)
    {
       /* Text colours */
@@ -9035,6 +9042,7 @@ static void *materialui_init(void **userdata, bool video_is_threaded)
    mui->last_stack_size                   = 1;
 
    mui->scroll_animation_selection        = 0;
+   mui->transition_alpha_lock             = false;
 
    /* Ensure message box string is empty */
    mui->msgbox[0]                         = '\0';
@@ -10393,6 +10401,12 @@ static enum menu_action materialui_parse_menu_entry_action(
             if (!materialui_entry_onscreen(mui, selection))
                new_action = MENU_ACTION_NOOP;
          }
+
+         /* Make transition smoother for single-click playlist launching */
+         if (     config_get_ptr()->bools.input_menu_singleclick_playlists
+               && (  mui->flags & MUI_FLAG_IS_PLAYLIST
+                  || mui->flags & MUI_FLAG_IS_EXPLORE_LIST))
+            mui->transition_alpha_lock = true;
          break;
       case MENU_ACTION_CANCEL:
          if (mui->flags & MUI_FLAG_SHOW_FULLSCREEN_THUMBNAILS)
@@ -10454,6 +10468,25 @@ static enum menu_action materialui_parse_menu_entry_action(
          break;
    }
 
+   switch (new_action)
+   {
+      case MENU_ACTION_UP:
+      case MENU_ACTION_DOWN:
+      case MENU_ACTION_LEFT:
+      case MENU_ACTION_RIGHT:
+      case MENU_ACTION_CANCEL:
+         if (     config_get_ptr()->bools.input_menu_singleclick_playlists
+               && mui->transition_alpha_lock)
+         {
+            mui->transition_alpha_lock = false;
+            mui->transition_alpha      = 1.0f;
+            new_action = MENU_ACTION_NOOP;
+         }
+         break;
+      default:
+         break;
+   }
+
    return new_action;
 }
 
@@ -12245,6 +12278,9 @@ static void materialui_toggle(void *userdata, bool menu_on)
    if (!mui)
       return;
 
+   /* Reset */
+   mui->transition_alpha_lock = false;
+
    /* Have to reset this, otherwise savestate
     * thumbnail won't update after selecting
     * 'save state' option */

menu/drivers/ozone.c

@@ -67,6 +67,7 @@
 #define OZONE_THUMBNAIL_STREAM_DELAY  16.66667f * 3
 
 #define OZONE_EASING_ALPHA            EASING_OUT_CIRC
+#define OZONE_EASING_ALPHA_IN         EASING_IN_QUAD
 #define OZONE_EASING_XY               EASING_OUT_QUAD
 
 #define FONT_SIZE_FOOTER              18
@@ -1581,6 +1582,7 @@ static ozone_theme_t *ozone_default_theme   = &ozone_theme_dark; /* also used as
 static float ozone_last_framebuffer_opacity = -1.0f;
 
 /* Forward declarations */
+static void ozone_animation_list_alpha(ozone_handle_t *ozone, bool fade_in);
 static void ozone_cursor_animation_cb(void *userdata);
 static void ozone_selection_changed(ozone_handle_t *ozone, bool allow_animation);
 static void ozone_unload_thumbnail_textures(void *data);
@@ -8698,6 +8700,12 @@ static enum menu_action ozone_parse_menu_entry_action(
             new_action = MENU_ACTION_ACCESSIBILITY_SPEAK_LABEL;
             break;
          }
+
+         /* Make transition smoother for single-click playlist launching */
+         if (     settings->bools.input_menu_singleclick_playlists
+               && (  ozone->flags & OZONE_FLAG_IS_PLAYLIST
+                  || ozone->flags & OZONE_FLAG_IS_EXPLORE_LIST))
+            ozone->animations.list_alpha = 0.0f;
          break;
       case MENU_ACTION_CANCEL:
          ozone->flags &= ~OZONE_FLAG_CURSOR_MODE;
@@ -8970,6 +8978,24 @@ static enum menu_action ozone_parse_menu_entry_action(
          break;
    }
 
+   switch (new_action)
+   {
+      case MENU_ACTION_UP:
+      case MENU_ACTION_DOWN:
+      case MENU_ACTION_LEFT:
+      case MENU_ACTION_RIGHT:
+      case MENU_ACTION_CANCEL:
+         if (     settings->bools.input_menu_singleclick_playlists
+               && ozone->animations.list_alpha < 1.0f)
+         {
+            ozone_animation_list_alpha(ozone, true);
+            new_action = MENU_ACTION_NOOP;
+         }
+         break;
+      default:
+         break;
+   }
+
    return new_action;
 }
 
@@ -9310,6 +9336,8 @@ static void ozone_refresh_thumbnail_image(void *data, size_t i)
    ozone->flags &= ~OZONE_FLAG_SKIP_THUMBNAIL_RESET;
    ozone_unload_thumbnail_textures(ozone);
 
+   ozone->flags |= OZONE_FLAG_FIRST_FRAME;
+
    /* Refresh metadata */
    if (!i)
       ozone_update_content_metadata(ozone);
@@ -11950,15 +11978,6 @@ static void ozone_frame(void *data, video_frame_info_t *video_info)
       }
    }
 
-   if (ozone->flags & OZONE_FLAG_FIRST_FRAME)
-   {
-      menu_input_get_pointer_state(&ozone->pointer);
-
-      ozone->cursor_x_old = ozone->pointer.x;
-      ozone->cursor_y_old = ozone->pointer.y;
-      ozone->flags       &= ~OZONE_FLAG_FIRST_FRAME;
-   }
-
    /* OSK Fade detection */
    if (draw_osk != draw_osk_old)
    {
@@ -12337,6 +12356,21 @@ static void ozone_animation_end(void *userdata)
    ozone->animations.cursor_alpha   = 1.0f;
 }
 
+static void ozone_animation_list_alpha(ozone_handle_t *ozone, bool fade_in)
+{
+   struct gfx_animation_ctx_entry entry;
+
+   entry.cb                     = ozone_animation_end;
+   entry.duration               = ANIMATION_PUSH_ENTRY_DURATION;
+   entry.easing_enum            = (fade_in) ? OZONE_EASING_ALPHA_IN : OZONE_EASING_ALPHA;
+   entry.subject                = &ozone->animations.list_alpha;
+   entry.tag                    = (uintptr_t)NULL;
+   entry.target_value           = (fade_in) ? 1.0f : 0.0f;
+   entry.userdata               = ozone;
+
+   gfx_animation_push(&entry);
+}
+
 static void ozone_list_open(
       ozone_handle_t *ozone,
       bool ozone_collapse_sidebar,
@@ -12347,6 +12381,9 @@ static void ozone_list_open(
 
    ozone->flags                   |= OZONE_FLAG_DRAW_OLD_LIST;
 
+   if (ozone->flags & OZONE_FLAG_FIRST_FRAME)
+      animate = false;
+
    /* Sidebar animation */
    ozone_sidebar_update_collapse(ozone, ozone_collapse_sidebar, animate);
 
@@ -12386,8 +12423,6 @@ static void ozone_list_open(
    {
       if (animate)
       {
-         struct gfx_animation_ctx_entry entry;
-
          entry.cb              = ozone_collapse_end;
          entry.duration        = ANIMATION_PUSH_ENTRY_DURATION;
          entry.easing_enum     = OZONE_EASING_XY;
@@ -12406,14 +12441,13 @@ static void ozone_list_open(
          ozone->sidebar_offset = -ozone->dimensions_sidebar_width;
    }
 
-   /* Left/right animation */
    if (animate)
    {
       ozone->animations.list_alpha = 0.0f;
 
       entry.cb                     = ozone_animation_end;
-      entry.duration               = ANIMATION_PUSH_ENTRY_DURATION;
-      entry.easing_enum            = OZONE_EASING_ALPHA;
+      entry.duration               = ANIMATION_PUSH_ENTRY_DURATION / 2;
+      entry.easing_enum            = OZONE_EASING_ALPHA_IN;
       entry.subject                = &ozone->animations.list_alpha;
       entry.tag                    = (uintptr_t)NULL;
       entry.target_value           = 1.0f;
@@ -12604,6 +12638,15 @@ static void ozone_populate_entries(
       if (ozone->categories_selection_ptr == ozone->categories_active_idx_old)
          ozone_list_open(ozone, ozone_collapse_sidebar, (!(ozone->flags & OZONE_FLAG_FIRST_FRAME)));
 
+   if (ozone->flags & OZONE_FLAG_FIRST_FRAME)
+   {
+      menu_input_get_pointer_state(&ozone->pointer);
+
+      ozone->cursor_x_old = ozone->pointer.x;
+      ozone->cursor_y_old = ozone->pointer.y;
+      ozone->flags       &= ~OZONE_FLAG_FIRST_FRAME;
+   }
+
    /* Reset savestate thumbnails always */
    ozone_update_savestate_thumbnail_path(ozone, (unsigned)menu_st->selection_ptr);
    ozone_update_savestate_thumbnail_image(ozone);
@@ -12753,6 +12796,9 @@ static void ozone_toggle(void *userdata, bool menu_on)
       gfx_animation_push(&entry);
    }
 
+   /* Reset */
+   ozone->animations.list_alpha    = 1.0f;
+
    /* Have to reset this, otherwise savestate
     * thumbnail won't update after selecting
     * 'save state' option */