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

Add set-difficulty tracking in BeatmapCarouselFilterGrouping

Browse Source 
Rather than tracking inside individual items, let's just maintain a
single dictionary which is refreshed every time we regenerate filters.
This commit is contained in:
Dean Herbert 2025-01-23 16:10:42 +09:00
parent 980f6cf18e
commit ecef5e5d71
No known key found for this signature in database
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
osu.Game/Screens/SelectV2/BeatmapCarouselFilterGrouping.cs
View File

@ -13,6 +13,13 @@ namespace osu.Game.Screens.SelectV2
{
public class BeatmapCarouselFilterGrouping : ICarouselFilter
{
/// <summary>
/// Beatmap sets contain difficulties as related panels. This dictionary holds the relationships between set-difficulties to allow expanding them on selection.
/// </summary>
public IDictionary<BeatmapSetInfo, HashSet<CarouselItem>> SetItems => setItems;
private readonly Dictionary<BeatmapSetInfo, HashSet<CarouselItem>> setItems = new Dictionary<BeatmapSetInfo, HashSet<CarouselItem>>();
private readonly Func<FilterCriteria> getCriteria;
public BeatmapCarouselFilterGrouping(Func<FilterCriteria> getCriteria)
@ -27,7 +34,10 @@ namespace osu.Game.Screens.SelectV2
if (criteria.SplitOutDifficulties)
{
foreach (var item in items)
((BeatmapCarouselItem)item).HasGroupHeader = false;
{
item.IsVisible = true;
item.IsGroupSelectionTarget = true;
}
return items;
}
@ -44,14 +54,25 @@ namespace osu.Game.Screens.SelectV2
{
// Add set header
if (lastItem == null || (lastItem.Model is BeatmapInfo b2 && b2.BeatmapSet!.OnlineID != b.BeatmapSet!.OnlineID))
newItems.Add(new BeatmapCarouselItem(b.BeatmapSet!) { IsGroupHeader = true });
{
newItems.Add(new CarouselItem(b.BeatmapSet!)
{
DrawHeight = 80,
IsGroupSelectionTarget = true
});
}
if (!setItems.TryGetValue(b.BeatmapSet!, out var related))
setItems[b.BeatmapSet!] = related = new HashSet<CarouselItem>();
related.Add(item);
}
newItems.Add(item);
lastItem = item;
var beatmapCarouselItem = (BeatmapCarouselItem)item;
beatmapCarouselItem.HasGroupHeader = true;
item.IsGroupSelectionTarget = false;
item.IsVisible = false;
}
return newItems;