diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelect.cs b/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelect.cs index e4f05b2e49..a480e51adf 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelect.cs +++ b/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelect.cs @@ -22,7 +22,6 @@ using osu.Game.Screens.Menu; using osu.Game.Screens.Play; using osu.Game.Screens.Ranking; using osu.Game.Screens.Select; -using osu.Game.Screens.Select.Filter; using osu.Game.Screens.Select.Leaderboards; using osu.Game.Screens.SelectV2; using osu.Game.Tests.Resources; @@ -144,41 +143,6 @@ namespace osu.Game.Tests.Visual.SongSelectV2 void onScreenPushed(IScreen lastScreen, IScreen newScreen) => screensPushed.Add(lastScreen); } - [TestCase(true)] - [TestCase(false)] - public void TestHoveringLeftSideReexpandsGroupSelectionIsIn(bool mouseOverPanel) - { - ImportBeatmapForRuleset(0); - - LoadSongSelect(); - SortAndGroupBy(SortMode.Difficulty, GroupMode.Difficulty); - - AddStep("move mouse to carousel", () => InputManager.MoveMouseTo(Carousel)); - - AddUntilStep("expanded group is below 1 star", - () => (Carousel.ChildrenOfType().SingleOrDefault(p => p.Expanded.Value)?.Item?.Model as StarDifficultyGroupDefinition)?.Difficulty.Stars, - () => Is.EqualTo(0)); - - AddStep("select next group", () => - { - InputManager.PressKey(Key.ShiftLeft); - InputManager.Key(Key.Right); - InputManager.ReleaseKey(Key.ShiftLeft); - }); - AddUntilStep("expanded group is 3 star", - () => (Carousel.ChildrenOfType().SingleOrDefault(p => p.Expanded.Value)?.Item?.Model as StarDifficultyGroupDefinition)?.Difficulty.Stars, - () => Is.EqualTo(3)); - - if (mouseOverPanel) - AddStep("move mouse over left panel", () => InputManager.MoveMouseTo(this.ChildrenOfType().Single())); - else - AddStep("move mouse to left side container", () => InputManager.MoveMouseTo(this.ChildrenOfType().Single())); - - AddUntilStep("expanded group is below 1 star", - () => (Carousel.ChildrenOfType().Single(p => p.Expanded.Value).Item?.Model as StarDifficultyGroupDefinition)?.Difficulty.Stars, - () => Is.EqualTo(0)); - } - #region Hotkeys [Test] diff --git a/osu.Game/Screens/SelectV2/BeatmapCarousel.cs b/osu.Game/Screens/SelectV2/BeatmapCarousel.cs index ae1c8eb878..aacebe4e88 100644 --- a/osu.Game/Screens/SelectV2/BeatmapCarousel.cs +++ b/osu.Game/Screens/SelectV2/BeatmapCarousel.cs @@ -693,18 +693,6 @@ namespace osu.Game.Screens.SelectV2 } } - public void ExpandGroupForCurrentSelection() - { - if (CurrentGroupedBeatmap?.Group == null) - return; - - if (CheckModelEquality(ExpandedGroup, CurrentGroupedBeatmap.Group)) - return; - - if (grouping.ItemMap.TryGetValue(CurrentGroupedBeatmap.Group, out var groupItem)) - Activate(groupItem.item); - } - protected override double? GetScrollTarget() { double? target = base.GetScrollTarget(); diff --git a/osu.Game/Screens/SelectV2/SongSelect.cs b/osu.Game/Screens/SelectV2/SongSelect.cs index e8843876d3..1b66bd5600 100644 --- a/osu.Game/Screens/SelectV2/SongSelect.cs +++ b/osu.Game/Screens/SelectV2/SongSelect.cs @@ -214,11 +214,7 @@ namespace osu.Game.Screens.SelectV2 // Pad enough to only reset scroll when well into the left wedge areas. Padding = new MarginPadding { Right = 40 }, RelativeSizeAxes = Axes.Both, - Child = new Select.SongSelect.LeftSideInteractionContainer(() => - { - carousel.ExpandGroupForCurrentSelection(); - carousel.ScrollToSelection(); - }) + Child = new Select.SongSelect.LeftSideInteractionContainer(() => carousel.ScrollToSelection()) { RelativeSizeAxes = Axes.Both, },