ppy · mk56-spn · Jan 14, 2023 · Jan 14, 2023 · Jan 14, 2023 · Jan 14, 2023
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -11,10 +11,12 @@
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
+using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Osu;
@@ -30,6 +32,9 @@ namespace osu.Game.Tests.Visual.SongSelect
     [TestFixture]
     public partial class TestSceneBeatmapCarousel : OsuManualInputManagerTestScene
     {
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Aquamarine);
+
         private TestBeatmapCarousel carousel;
         private RulesetStore rulesets;
 
@@ -47,6 +52,18 @@ private void load(RulesetStore rulesets)
             this.rulesets = rulesets;
         }
 
+        [Test]
+        public void TestBasic()
+        {
+            loadBeatmaps(setCount: 10, randomDifficulties: true);
+
+            AddSliderStep("change star difficulty", 0, 11.9, 5.55, v =>
+            {
+                foreach (var hasCurrentValue in carousel.ChildrenOfType<IHasCurrentValue<StarDifficulty>>())
+                    hasCurrentValue.Current.Value = new StarDifficulty(v, 0);
+            });
+        }
+
         [Test]
         public void TestExternalRulesetChange()
         {
@@ -888,11 +905,11 @@ public void TestSortingWithDifficultyFiltered()
             AddStep("Sort by difficulty", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty }, false));
 
             checkVisibleItemCount(false, local_set_count * local_diff_count);
-            checkVisibleItemCount(true, 1);
+            checkVisibleItemCount(true, 0);
 
             AddStep("Filter to normal", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty, SearchText = "Normal" }, false));
             checkVisibleItemCount(false, local_set_count);
-            checkVisibleItemCount(true, 1);
+            checkVisibleItemCount(true, 0);
 
             AddUntilStep("Check all visible sets have one normal", () =>
             {
@@ -903,7 +920,7 @@ public void TestSortingWithDifficultyFiltered()
 
             AddStep("Filter to insane", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty, SearchText = "Insane" }, false));
             checkVisibleItemCount(false, local_set_count);
-            checkVisibleItemCount(true, 1);
+            checkVisibleItemCount(true, 0);
 
             AddUntilStep("Check all visible sets have one insane", () =>
             {

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -736,15 +736,6 @@ public void TestExternalBeatmapChangeWhileFiltered(bool differentRuleset)
 
             AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo != null);
 
-            AddAssert("selected only shows expected ruleset (plus converts)", () =>
-            {
-                var selectedPanel = songSelect!.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().First(s => s.Item!.State.Value == CarouselItemState.Selected);
-
-                // special case for converts checked here.
-                return selectedPanel.ChildrenOfType<FilterableDifficultyIcon>().All(i =>
-                    i.IsFiltered || i.Item.BeatmapInfo.Ruleset.OnlineID == targetRuleset || i.Item.BeatmapInfo.Ruleset.OnlineID == 0);
-            });
-
             AddUntilStep("carousel has correct", () => songSelect!.Carousel.SelectedBeatmapInfo?.MatchesOnlineID(target) == true);
             AddUntilStep("game has correct", () => Beatmap.Value.BeatmapInfo.MatchesOnlineID(target));
 
@@ -886,79 +877,6 @@ public void TestHideSetSelectsCorrectBeatmap()
             AddAssert("Selected beatmap has not changed", () => songSelect!.Carousel.SelectedBeatmapInfo?.ID == previousID);
         }
 
-        [Test]
-        public void TestDifficultyIconSelecting()
-        {
-            addRulesetImportStep(0);
-            createSongSelect();
-
-            AddUntilStep("wait for selection", () => !Beatmap.IsDefault);
-
-            DrawableCarouselBeatmapSet set = null!;
-            AddStep("Find the DrawableCarouselBeatmapSet", () =>
-            {
-                set = songSelect!.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().First();
-            });
-
-            FilterableDifficultyIcon difficultyIcon = null!;
-
-            AddUntilStep("Find an icon", () =>
-            {
-                var foundIcon = set.ChildrenOfType<FilterableDifficultyIcon>()
-                                   .FirstOrDefault(icon => getDifficultyIconIndex(set, icon) != getCurrentBeatmapIndex());
-
-                if (foundIcon == null)
-                    return false;
-
-                difficultyIcon = foundIcon;
-                return true;
-            });
-
-            AddStep("Click on a difficulty", () =>
-            {
-                InputManager.MoveMouseTo(difficultyIcon);
-
-                InputManager.Click(MouseButton.Left);
-            });
-
-            AddAssert("Selected beatmap correct", () => getCurrentBeatmapIndex() == getDifficultyIconIndex(set, difficultyIcon));
-
-            double? maxBPM = null;
-            AddStep("Filter some difficulties", () => songSelect!.Carousel.Filter(new FilterCriteria
-            {
-                BPM = new FilterCriteria.OptionalRange<double>
-                {
-                    Min = maxBPM = songSelect!.Carousel.SelectedBeatmapSet!.MaxBPM,
-                    IsLowerInclusive = true
-                }
-            }));
-
-            BeatmapInfo? filteredBeatmap = null;
-            FilterableDifficultyIcon? filteredIcon = null;
-
-            AddStep("Get filtered icon", () =>
-            {
-                var selectedSet = songSelect!.Carousel.SelectedBeatmapSet;
-
-                Debug.Assert(selectedSet != null);
-
-                filteredBeatmap = selectedSet.Beatmaps.First(b => b.BPM < maxBPM);
-                int filteredBeatmapIndex = getBeatmapIndex(selectedSet, filteredBeatmap);
-                filteredIcon = set.ChildrenOfType<FilterableDifficultyIcon>().ElementAt(filteredBeatmapIndex);
-            });
-
-            AddStep("Click on a filtered difficulty", () =>
-            {
-                Debug.Assert(filteredIcon != null);
-
-                InputManager.MoveMouseTo(filteredIcon);
-
-                InputManager.Click(MouseButton.Left);
-            });
-
-            AddAssert("Selected beatmap correct", () => songSelect!.Carousel.SelectedBeatmapInfo?.Equals(filteredBeatmap) == true);
-        }
-
         [Test]
         public void TestChangingRulesetOnMultiRulesetBeatmap()
         {
@@ -1008,107 +926,6 @@ public void TestChangingRulesetOnMultiRulesetBeatmap()
             void onChange(ValueChangedEvent<WorkingBeatmap> valueChangedEvent) => changeCount++;
         }
 
-        [Test]
-        public void TestDifficultyIconSelectingForDifferentRuleset()
-        {
-            changeRuleset(0);
-
-            createSongSelect();
-
-            AddStep("import multi-ruleset map", () =>
-            {
-                var usableRulesets = rulesets.AvailableRulesets.Where(r => r.OnlineID != 2).ToArray();
-                manager.Import(TestResources.CreateTestBeatmapSetInfo(3, usableRulesets));
-            });
-
-            DrawableCarouselBeatmapSet? set = null;
-            AddUntilStep("Find the DrawableCarouselBeatmapSet", () =>
-            {
-                set = songSelect!.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().FirstOrDefault();
-                return set != null;
-            });
-
-            FilterableDifficultyIcon? difficultyIcon = null;
-            AddUntilStep("Find an icon for different ruleset", () =>
-            {
-                difficultyIcon = set.ChildrenOfType<FilterableDifficultyIcon>()
-                                    .FirstOrDefault(icon => icon.Item.BeatmapInfo.Ruleset.OnlineID == 3);
-                return difficultyIcon != null;
-            });
-
-            AddAssert("Check ruleset is osu!", () => Ruleset.Value.OnlineID == 0);
-
-            int previousSetID = 0;
-
-            AddStep("record set ID", () => previousSetID = ((IBeatmapSetInfo)Beatmap.Value.BeatmapSetInfo).OnlineID);
-
-            AddStep("Click on a difficulty", () =>
-            {
-                Debug.Assert(difficultyIcon != null);
-
-                InputManager.MoveMouseTo(difficultyIcon);
-
-                InputManager.Click(MouseButton.Left);
-            });
-
-            AddUntilStep("Check ruleset changed to mania", () => Ruleset.Value.OnlineID == 3);
-
-            AddAssert("Selected beatmap still same set", () => songSelect!.Carousel.SelectedBeatmapInfo?.BeatmapSet?.OnlineID == previousSetID);
-            AddAssert("Selected beatmap is mania", () => Beatmap.Value.BeatmapInfo.Ruleset.OnlineID == 3);
-        }
-
-        [Test]
-        public void TestGroupedDifficultyIconSelecting()
-        {
-            changeRuleset(0);
-
-            createSongSelect();
-
-            BeatmapSetInfo? imported = null;
-
-            AddStep("import huge difficulty count map", () =>
-            {
-                var usableRulesets = rulesets.AvailableRulesets.Where(r => r.OnlineID != 2).ToArray();
-                imported = manager.Import(TestResources.CreateTestBeatmapSetInfo(50, usableRulesets))?.Value;
-            });
-
-            AddStep("select the first beatmap of import", () => Beatmap.Value = manager.GetWorkingBeatmap(imported?.Beatmaps.First()));
-
-            DrawableCarouselBeatmapSet? set = null;
-            AddUntilStep("Find the DrawableCarouselBeatmapSet", () =>
-            {
-                set = songSelect!.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().FirstOrDefault();
-                return set != null;
-            });
-
-            GroupedDifficultyIcon groupIcon = null!;
-
-            AddUntilStep("Find group icon for different ruleset", () =>
-            {
-                var foundIcon = set.ChildrenOfType<GroupedDifficultyIcon>()
-                                   .FirstOrDefault(icon => icon.Items.First().BeatmapInfo.Ruleset.OnlineID == 3);
-
-                if (foundIcon == null)
-                    return false;
-
-                groupIcon = foundIcon;
-                return true;
-            });
-
-            AddAssert("Check ruleset is osu!", () => Ruleset.Value.OnlineID == 0);
-
-            AddStep("Click on group", () =>
-            {
-                InputManager.MoveMouseTo(groupIcon);
-
-                InputManager.Click(MouseButton.Left);
-            });
-
-            AddUntilStep("Check ruleset changed to mania", () => Ruleset.Value.OnlineID == 3);
-
-            AddAssert("Check first item in group selected", () => Beatmap.Value.BeatmapInfo.MatchesOnlineID(groupIcon.Items.First().BeatmapInfo));
-        }
-
         [Test]
         public void TestChangeRulesetWhilePresentingScore()
         {
@@ -1335,11 +1152,6 @@ private int getCurrentBeatmapIndex()
             return getBeatmapIndex(songSelect!.Carousel.SelectedBeatmapSet, songSelect!.Carousel.SelectedBeatmapInfo);
         }
 
-        private int getDifficultyIconIndex(DrawableCarouselBeatmapSet set, FilterableDifficultyIcon icon)
-        {
-            return set.ChildrenOfType<FilterableDifficultyIcon>().ToList().FindIndex(i => i == icon);
-        }
-
         private void addRulesetImportStep(int id)
         {
             Live<BeatmapSetInfo>? imported = null;

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs
@@ -25,6 +25,9 @@ namespace osu.Game.Tests.Visual.SongSelect
     [TestFixture]
     public partial class TestSceneUpdateBeatmapSetButton : OsuManualInputManagerTestScene
     {
+        [Cached]
+        private readonly OverlayColourProvider overlayColour = new OverlayColourProvider(OverlayColourScheme.Aquamarine);
+
         private BeatmapCarousel carousel = null!;
 
         private TestSceneOnlinePlayBeatmapAvailabilityTracker.TestBeatmapModelDownloader beatmapDownloader = null!;

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -1043,7 +1043,7 @@ private void updateYPositions()
                             // scroll position at currentY makes the set panel appear at the very top of the carousel's screen space
                             // move down by half of visible height (height of the carousel's visible extent, including semi-transparent areas)
                             // then reapply the top semi-transparent area (because carousel's screen space starts below it)
-                            scrollTarget = currentY + DrawableCarouselBeatmapSet.HEIGHT - visibleHalfHeight + BleedTop;
+                            scrollTarget = currentY + (set.Beatmaps.Count() == 1 ? 0 : DrawableCarouselBeatmapSet.HEIGHT) - visibleHalfHeight + BleedTop;
 
                             foreach (var b in set.Beatmaps)
                             {

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -20,7 +20,8 @@ public override float TotalHeight
                 switch (State.Value)
                 {
                     case CarouselItemState.Selected:
-                        return DrawableCarouselBeatmapSet.HEIGHT + Items.Count(c => c.Visible) * DrawableCarouselBeatmap.HEIGHT;
+                        return DrawableCarouselBeatmapSet.HEIGHT
+                               + (Items.Count == 1 ? 0 : Items.Count(c => c.Visible) * DrawableCarouselBeatmap.HEIGHT);
 
                     default:
                         return DrawableCarouselBeatmapSet.HEIGHT;