h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-27 15:30:44 +08:00
Code Issues Releases Wiki Activity

Merge pull request #35239 from bdach/song-select-weirdness

Browse Source 
Fix current beatmap set being incorrectly expanded after collapsing group with current selection
This commit is contained in:
Dean Herbert
2025-10-08 21:19:08 +09:00
committed by GitHub
Unverified
parent 1a522a19f1 9ba9966078
commit ffe8b9f4c3
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselArtistGrouping.cs
+13
View File
@@ -283,5 +283,18 @@ namespace osu.Game.Tests.Visual.SongSelectV2
CheckHasSelection();
}
[Test]
public void TestManuallyCollapsingCurrentGroupAndOpeningAnother()
{
SelectNextSet();
ToggleGroupCollapse();
SelectNextGroup();
AddUntilStep("no beatmap panels visible", () => GetVisiblePanels<PanelBeatmap>().Count(), () => Is.Zero);
SelectNextSet();
SelectNextSet();
AddUntilStep("no beatmap panels visible", () => GetVisiblePanels<PanelBeatmap>().Count(), () => Is.Zero);
}
}
}
osu.Game/Screens/SelectV2/BeatmapCarousel.cs
+1 -1
View File
@@ -371,7 +371,7 @@ namespace osu.Game.Screens.SelectV2
if (userCollapsedGroup)
{
if (grouping.BeatmapSetsGroupedTogether && CurrentGroupedBeatmap != null)
if (grouping.BeatmapSetsGroupedTogether && CurrentGroupedBeatmap != null && CheckModelEquality(group, CurrentGroupedBeatmap.Group))
setExpandedSet(new GroupedBeatmapSet(CurrentGroupedBeatmap.Group, CurrentGroupedBeatmap.Beatmap.BeatmapSet!));
userCollapsedGroup = false;
}