h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-07 22:53:09 +08:00
Code Issues Releases Wiki Activity

Fix sort direction being flipped

Browse Source
This commit is contained in:
Dean Herbert 2025-01-23 16:48:03 +09:00
parent 9ab045495d
commit ffca90779f
No known key found for this signature in database
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game.Tests/Visual/SongSelect/BeatmapCarouselV2TestScene.cs
View File

@ -55,7 +55,7 @@ namespace osu.Game.Tests.Visual.SongSelect
[SetUpSteps]
public void SetUpSteps()
{
AddStep("reset beatmaps", () => BeatmapSets.Clear());
RemoveAllBeatmaps();
CreateCarousel();
@ -146,12 +146,14 @@ namespace osu.Game.Tests.Visual.SongSelect
BeatmapSets.Add(TestResources.CreateTestBeatmapSetInfo(fixedDifficultiesPerSet ?? RNG.Next(1, 4)));
});
protected void RemoveLastBeatmap() =>
AddStep("remove last beatmap", () =>
protected void RemoveAllBeatmaps() => AddStep("clear all beatmaps", () => BeatmapSets.Clear());
protected void RemoveFirstBeatmap() =>
AddStep("remove first beatmap", () =>
{
if (BeatmapSets.Count == 0) return;
BeatmapSets.Remove(BeatmapSets.Last());
BeatmapSets.Remove(BeatmapSets.First());
});
private void updateStats()

10
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselV2Basics.cs
View File

@ -28,8 +28,8 @@ namespace osu.Game.Tests.Visual.SongSelect
{
AddBeatmaps(1);
AddBeatmaps(10);
RemoveLastBeatmap();
AddStep("remove all beatmaps", () => BeatmapSets.Clear());
RemoveFirstBeatmap();
RemoveAllBeatmaps();
}
[Test]
@ -62,7 +62,7 @@ namespace osu.Game.Tests.Visual.SongSelect
AddStep("save selected screen position", () => positionBefore = Carousel.ChildrenOfType<BeatmapCarouselPanel>().FirstOrDefault(p => p.Selected.Value)!.ScreenSpaceDrawQuad);
RemoveLastBeatmap();
RemoveFirstBeatmap();
WaitForSorting();
AddAssert("select screen position unchanged", () => Carousel.ChildrenOfType<BeatmapCarouselPanel>().Single(p => p.Selected.Value).ScreenSpaceDrawQuad,
@ -79,13 +79,13 @@ namespace osu.Game.Tests.Visual.SongSelect
AddStep("scroll to last item", () => Scroll.ScrollToEnd(false));
AddStep("select last beatmap", () => Carousel.CurrentSelection = BeatmapSets.First());
AddStep("select last beatmap", () => Carousel.CurrentSelection = BeatmapSets.Last());
WaitForScrolling();
AddStep("save selected screen position", () => positionBefore = Carousel.ChildrenOfType<BeatmapCarouselPanel>().FirstOrDefault(p => p.Selected.Value)!.ScreenSpaceDrawQuad);
RemoveLastBeatmap();
RemoveFirstBeatmap();
WaitForSorting();
AddAssert("select screen position unchanged", () => Carousel.ChildrenOfType<BeatmapCarouselPanel>().Single(p => p.Selected.Value).ScreenSpaceDrawQuad,
() => Is.EqualTo(positionBefore));

2
osu.Game/Screens/SelectV2/BeatmapCarouselFilterSorting.cs
View File

@ -26,7 +26,7 @@ namespace osu.Game.Screens.SelectV2
{
var criteria = getCriteria();
return items.OrderDescending(Comparer<CarouselItem>.Create((a, b) =>
return items.Order(Comparer<CarouselItem>.Create((a, b) =>
{
int comparison;