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

Expose set grouping state

Browse Source
This commit is contained in:
Dean Herbert 2025-02-06 14:30:15 +09:00
parent 0257b8c2ff
commit 88ad87a78e
No known key found for this signature in database
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,7 +140,7 @@ namespace osu.Game.Screens.SelectV2
return true;
case BeatmapInfo:
return Criteria.SplitOutDifficulties;
return !grouping.BeatmapSetsGroupedTogether;
case GroupDefinition:
return false;

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

@ -14,6 +14,8 @@ namespace osu.Game.Screens.SelectV2
{
public class BeatmapCarouselFilterGrouping : ICarouselFilter
{
public bool BeatmapSetsGroupedTogether { get; private set; }
/// <summary>
/// Beatmap sets contain difficulties as related panels. This dictionary holds the relationships between set-difficulties to allow expanding them on selection.
/// </summary>
@ -36,8 +38,6 @@ namespace osu.Game.Screens.SelectV2
public async Task<IEnumerable<CarouselItem>> Run(IEnumerable<CarouselItem> items, CancellationToken cancellationToken) => await Task.Run(() =>
{
bool groupSetsTogether;
setItems.Clear();
groupItems.Clear();
@ -48,12 +48,12 @@ namespace osu.Game.Screens.SelectV2
switch (criteria.Group)
{
default:
groupSetsTogether = true;
BeatmapSetsGroupedTogether = true;
newItems.AddRange(items);
break;
case GroupMode.Artist:
groupSetsTogether = true;
BeatmapSetsGroupedTogether = true;
char groupChar = (char)0;
foreach (var item in items)
@ -80,7 +80,7 @@ namespace osu.Game.Screens.SelectV2
break;
case GroupMode.Difficulty:
groupSetsTogether = false;
BeatmapSetsGroupedTogether = false;
int starGroup = int.MinValue;
foreach (var item in items)
@ -108,7 +108,7 @@ namespace osu.Game.Screens.SelectV2
// Add set headers wherever required.
CarouselItem? lastItem = null;
if (groupSetsTogether)
if (BeatmapSetsGroupedTogether)
{
for (int i = 0; i < newItems.Count; i++)
{