Merge pull request #2135 from peppy/fix-song-select-sort

Fix depth of already-visible panels not being updated after a sorting change
This commit is contained in:
Dean Herbert
2018-02-28 14:34:14 +09:00
committed by GitHub
2 changed files with 8 additions and 2 deletions

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.