Merge branch 'master' into reduce-transforms

2026-05-18 19:50:31 +08:00 · 2018-02-28 14:39:31 +09:00
parent 0cd049c6b0 04d0e21ade
commit bc0bbd2e3b
2 changed files with 8 additions and 2 deletions
@@ -407,12 +407,14 @@ namespace osu.Game.Screens.Select
                    continue;
                }

+                float depth = i + (item is DrawableCarouselBeatmapSet ? -Items.Count : 0);
+
                // Only add if we're not already part of the content.
                if (!scrollableContent.Contains(item))
                {
                    // Makes sure headers are always _below_ items,
                    // and depth flows downward.
-                    item.Depth = i + (item is DrawableCarouselBeatmapSet ? -Items.Count : 0);
+                    item.Depth = depth;

                    switch (item.LoadState)
                    {
@@ -426,6 +428,10 @@ namespace osu.Game.Screens.Select
                            break;
                    }
                }
+                else
+                {
+                    scrollableContent.ChangeChildDepth(item, depth);
+                }
            }

            // this is not actually useful right now, but once we have groups may well be.