h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-02 12:10:12 +08:00
Code Issues Releases Wiki Activity

Display separate design for beatmap panels on difficulty sort mode

Browse Source
This commit is contained in:
Salman Alshamrani
2025-05-07 12:41:27 +03:00
committed by Dean Herbert
Unverified
parent a360f153f7
commit f58cf8e971
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Screens/SelectV2/BeatmapCarousel.cs
+6 -3
View File
@@ -47,7 +47,7 @@ namespace osu.Game.Screens.SelectV2
return SPACING * 2;
// Beatmap difficulty panels do not overlap with themselves or any other panel.
if (top.Model is BeatmapInfo || bottom.Model is BeatmapInfo)
if (grouping.BeatmapSetsGroupedTogether && (top.Model is BeatmapInfo || bottom.Model is BeatmapInfo))
return SPACING;
return -SPACING;
@@ -365,6 +365,7 @@ namespace osu.Game.Screens.SelectV2
#region Drawable pooling
private readonly DrawablePool<PanelBeatmap> beatmapPanelPool = new DrawablePool<PanelBeatmap>(100);
private readonly DrawablePool<PanelBeatmapStandalone> standalonePanelPool = new DrawablePool<PanelBeatmapStandalone>(100);
private readonly DrawablePool<PanelBeatmapSet> setPanelPool = new DrawablePool<PanelBeatmapSet>(100);
private readonly DrawablePool<PanelGroup> groupPanelPool = new DrawablePool<PanelGroup>(100);
private readonly DrawablePool<PanelGroupStarDifficulty> starsGroupPanelPool = new DrawablePool<PanelGroupStarDifficulty>(11);
@@ -374,6 +375,7 @@ namespace osu.Game.Screens.SelectV2
AddInternal(starsGroupPanelPool);
AddInternal(groupPanelPool);
AddInternal(beatmapPanelPool);
AddInternal(standalonePanelPool);
AddInternal(setPanelPool);
}
@@ -406,8 +408,9 @@ namespace osu.Game.Screens.SelectV2
return groupPanelPool.Get();
case BeatmapInfo:
// TODO: if beatmap is a group selection target, it needs to be a different drawable
// with more information attached.
if (!grouping.BeatmapSetsGroupedTogether)
return standalonePanelPool.Get();
return beatmapPanelPool.Get();
case BeatmapSetInfo:
osu.Game/Screens/SelectV2/BeatmapCarouselFilterGrouping.cs
+3 -1
View File
@@ -54,7 +54,7 @@ namespace osu.Game.Screens.SelectV2
HashSet<CarouselItem>? currentGroupItems = null;
HashSet<CarouselItem>? currentSetItems = null;
BeatmapSetsGroupedTogether = criteria.Group != GroupMode.Difficulty;
BeatmapSetsGroupedTogether = criteria.Sort != SortMode.Difficulty;
foreach (var item in items)
{
@@ -100,6 +100,8 @@ namespace osu.Game.Screens.SelectV2
{
if (lastGroupItem != null)
lastGroupItem.NestedItemCount++;
item.DrawHeight = PanelBeatmapStandalone.HEIGHT;
}
addItem(item);