Merge pull request #33598 from peppy/ssv2-difficulty-traversal-selection

Allow changing difficulties using up and down arrows when sets are grouped

Author: bdach

osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselArtistGrouping.cs

@@ -163,13 +163,17 @@ public void TestKeyboardSelection()
             SelectNextGroup();
             WaitForGroupSelection(0, 1);
 
+            // Difficulties should get immediate selection even when using up and down traversal.
             SelectNextPanel();
+            WaitForGroupSelection(0, 2);
             SelectNextPanel();
+            WaitForGroupSelection(0, 3);
+
             SelectNextPanel();
-            SelectNextPanel();
+            WaitForGroupSelection(0, 3);
 
             SelectNextGroup();
-            WaitForGroupSelection(0, 1);
+            WaitForGroupSelection(0, 5);
 
             SelectNextPanel();
             SelectNextGroup();

osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselNoGrouping.cs

@@ -171,15 +171,9 @@ public void TestKeyboardSelection()
             WaitForSelection(3, 0);
 
             SelectNextPanel();
-            WaitForSelection(3, 0);
-
-            Select();
             WaitForSelection(3, 1);
 
             SelectNextPanel();
-            WaitForSelection(3, 1);
-
-            Select();
             WaitForSelection(3, 2);
 
             SelectNextPanel();

osu.Game/Graphics/Carousel/Carousel.cs

@@ -240,6 +240,12 @@ protected virtual void HandleFilterCompleted()
         /// <returns>Whether the provided item is a valid group target. If <c>false</c>, more panels will be checked in the user's requested direction until a valid target is found.</returns>
         protected virtual bool CheckValidForGroupSelection(CarouselItem item) => true;
 
+        /// <summary>
+        /// Keyboard selection usually does not automatically activate an item. There may be exceptions to this rule.
+        /// Returning <c>true</c> here will make keyboard traversal act like group traversal for the target item.
+        /// </summary>
+        protected virtual bool ShouldActivateOnKeyboardSelection(CarouselItem item) => false;
+
         /// <summary>
         /// Called after an item becomes the <see cref="CurrentSelection"/>.
         /// Should be used to handle any group expansion, item visibility changes, etc.
@@ -500,8 +506,14 @@ private void traverseKeyboardSelection(int direction)
 
                 if (newItem.IsVisible)
                 {
-                    playTraversalSound();
-                    setKeyboardSelection(newItem.Model);
+                    if (!CheckModelEquality(currentSelection.Model, newItem.Model) && ShouldActivateOnKeyboardSelection(newItem))
+                        Activate(newItem);
+                    else
+                    {
+                        playTraversalSound();
+                        setKeyboardSelection(newItem.Model);
+                    }
+
                     return;
                 }
             } while (newIndex != originalIndex);

osu.Game/Screens/SelectV2/BeatmapCarousel.cs

@@ -208,6 +208,9 @@ private void beatmapSetsChanged(object? beatmaps, NotifyCollectionChangedEventAr
 
         protected BeatmapSetInfo? ExpandedBeatmapSet { get; private set; }
 
+        protected override bool ShouldActivateOnKeyboardSelection(CarouselItem item) =>
+            grouping.BeatmapSetsGroupedTogether && item.Model is BeatmapInfo;
+
         protected override void HandleItemActivated(CarouselItem item)
         {
             try

osu.Game/Screens/SelectV2/BeatmapLeaderboardWedge.cs

@@ -201,19 +201,19 @@ private void refetchScoresFromMods()
 
         private void refetchScores()
         {
-            refetchOperation?.Cancel();
-            refetchOperation = Scheduler.AddDelayed(() =>
-            {
-                SetScores(Array.Empty<ScoreInfo>());
+            SetScores(Array.Empty<ScoreInfo>());
 
-                if (beatmap.IsDefault)
-                {
-                    SetState(LeaderboardState.NoneSelected);
-                    return;
-                }
+            if (beatmap.IsDefault)
+            {
+                SetState(LeaderboardState.NoneSelected);
+                return;
+            }
 
-                SetState(LeaderboardState.Retrieving);
+            SetState(LeaderboardState.Retrieving);
 
+            refetchOperation?.Cancel();
+            refetchOperation = Scheduler.AddDelayed(() =>
+            {
                 var fetchBeatmapInfo = beatmap.Value.BeatmapInfo;
                 var fetchRuleset = ruleset.Value ?? fetchBeatmapInfo.Ruleset;
 
@@ -230,7 +230,7 @@ private void refetchScores()
                     fetchedScores.BindValueChanged(_ => updateScores(), true);
                     initialFetchComplete = true;
                 }
-            }, initialFetchComplete ? 200 : 0);
+            }, initialFetchComplete ? 300 : 0);
         }
 
         private void updateScores()