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

Merge branch 'master' into reduce-transforms

Browse Source
This commit is contained in:
Dean Herbert 2018-02-28 14:39:31 +09:00 committed by GitHub
commit bc0bbd2e3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 9a773e62eb246206b918ba4fccf9f2507aaa4595 Subproject commit 500a791577979669e47eece699d5bd8b9068ee4b

8
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -407,12 +407,14 @@ namespace osu.Game.Screens.Select
continue; continue;
} }
float depth = i + (item is DrawableCarouselBeatmapSet ? -Items.Count : 0);
// Only add if we're not already part of the content. // Only add if we're not already part of the content.
if (!scrollableContent.Contains(item)) if (!scrollableContent.Contains(item))
{ {
// Makes sure headers are always _below_ items, // Makes sure headers are always _below_ items,
// and depth flows downward. // and depth flows downward.
item.Depth = i + (item is DrawableCarouselBeatmapSet ? -Items.Count : 0); item.Depth = depth;
switch (item.LoadState) switch (item.LoadState)
{ {
@ -426,6 +428,10 @@ namespace osu.Game.Screens.Select
break; break;
} }
} }
else
{
scrollableContent.ChangeChildDepth(item, depth);
}
} }
// this is not actually useful right now, but once we have groups may well be. // this is not actually useful right now, but once we have groups may well be.