diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestScenePanelGroup.cs b/osu.Game.Tests/Visual/SongSelectV2/TestScenePanelGroup.cs index e6a58136fa..f678ec372a 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestScenePanelGroup.cs +++ b/osu.Game.Tests/Visual/SongSelectV2/TestScenePanelGroup.cs @@ -3,7 +3,6 @@ using System; using NUnit.Framework; -using osu.Framework.Extensions; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Game.Beatmaps; @@ -120,21 +119,21 @@ namespace osu.Game.Tests.Visual.SongSelectV2 { new PanelGroupRankDisplay { - Item = new CarouselItem(new RankDisplayGroupDefinition(0, $"{rank.GetDescription()}", rank)) + Item = new CarouselItem(new RankDisplayGroupDefinition(rank)) }, new PanelGroupRankDisplay { - Item = new CarouselItem(new RankDisplayGroupDefinition(1, $"{rank.GetDescription()}", rank)), + Item = new CarouselItem(new RankDisplayGroupDefinition(rank)), KeyboardSelected = { Value = true }, }, new PanelGroupRankDisplay { - Item = new CarouselItem(new RankDisplayGroupDefinition(2, $"{rank.GetDescription()}", rank)), + Item = new CarouselItem(new RankDisplayGroupDefinition(rank)), Expanded = { Value = true }, }, new PanelGroupRankDisplay { - Item = new CarouselItem(new RankDisplayGroupDefinition(3, $"{rank.GetDescription()}", rank)), + Item = new CarouselItem(new RankDisplayGroupDefinition(rank)), Expanded = { Value = true }, KeyboardSelected = { Value = true }, }, diff --git a/osu.Game/Screens/SelectV2/BeatmapCarousel.cs b/osu.Game/Screens/SelectV2/BeatmapCarousel.cs index 679fec76f2..135187dc08 100644 --- a/osu.Game/Screens/SelectV2/BeatmapCarousel.cs +++ b/osu.Game/Screens/SelectV2/BeatmapCarousel.cs @@ -13,6 +13,7 @@ using osu.Framework.Allocation; using osu.Framework.Audio; using osu.Framework.Audio.Sample; using osu.Framework.Bindables; +using osu.Framework.Extensions; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Pooling; @@ -1093,7 +1094,7 @@ namespace osu.Game.Screens.SelectV2 /// /// Defines a grouping header for a set of carousel items grouped by achieved rank. /// - public record RankDisplayGroupDefinition(int Order, string Title, ScoreRank Rank) : GroupDefinition(Order, Title); + public record RankDisplayGroupDefinition(ScoreRank Rank) : GroupDefinition(-(int)Rank, Rank.GetDescription()); /// /// Used to represent a portion of a under a . diff --git a/osu.Game/Screens/SelectV2/BeatmapCarouselFilterGrouping.cs b/osu.Game/Screens/SelectV2/BeatmapCarouselFilterGrouping.cs index f2159d63f5..37ea7b7497 100644 --- a/osu.Game/Screens/SelectV2/BeatmapCarouselFilterGrouping.cs +++ b/osu.Game/Screens/SelectV2/BeatmapCarouselFilterGrouping.cs @@ -433,7 +433,7 @@ namespace osu.Game.Screens.SelectV2 private IEnumerable defineGroupByRankAchieved(BeatmapInfo beatmap, IReadOnlyDictionary topRankMapping) { if (topRankMapping.TryGetValue(beatmap.ID, out var rank)) - return new RankDisplayGroupDefinition(-(int)rank, rank.GetDescription(), rank).Yield(); + return new RankDisplayGroupDefinition(rank).Yield(); return new GroupDefinition(int.MaxValue, "Unplayed").Yield(); }