Merge pull request #206 from Tom94/fix-depth

Fix depth values.

osu-framework

@@ -1 +1 @@
-Subproject commit e125c03d8c39fd86e02e872a8d46654d2ea2759f
+Subproject commit 4fd477755a640a497c04fc8e540e8641278aa056

osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs

@@ -32,7 +32,7 @@ public override void Reset()
 
             Clock.ProcessFrame();
 
-            Container approachContainer = new Container { Depth = float.MaxValue, };
+            Container approachContainer = new Container { Depth = float.MinValue, };
 
             Add(approachContainer);
 
@@ -50,7 +50,7 @@ public override void Reset()
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Depth = -i,
+                    Depth = i,
                     State = ArmedState.Hit,
                 };
 

osu.Game.Mode.Osu/Objects/Drawables/DrawableSlider.cs

@@ -44,7 +44,7 @@ public DrawableSlider(Slider s) : base(s)
                     Colour = s.Colour,
                 })
                 {
-                    Depth = 1 //override time-based depth.
+                    Depth = -1 //override time-based depth.
                 },
             };
         }

osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs

@@ -119,7 +119,7 @@ public PanelBackground(WorkingBeatmap working)
                 {
                     new FlowContainer
                     {
-                        Depth = 1,
+                        Depth = -1,
                         Direction = FlowDirection.HorizontalOnly,
                         RelativeSizeAxes = Axes.Both,
                         // This makes the gradient not be perfectly horizontal, but diagonal at a ~40° angle

osu.Game/Graphics/Backgrounds/Background.cs

@@ -22,7 +22,7 @@ public Background(string textureName = @"")
         {
             this.textureName = textureName;
             RelativeSizeAxes = Axes.Both;
-            Depth = float.MinValue;
+            Depth = float.MaxValue;
 
             Add(Sprite = new Sprite
             {

osu.Game/Graphics/Cursor/OsuCursorContainer.cs

@@ -19,7 +19,7 @@ class OsuCursorContainer : CursorContainer
 
         public OsuCursorContainer()
         {
-            Add(new CursorTrail { Depth = -1 });
+            Add(new CursorTrail { Depth = 1 });
         }
 
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)

osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs

@@ -26,7 +26,7 @@ public abstract class DrawableHitObject : Container, IStateful<ArmedState>
         public DrawableHitObject(HitObject hitObject)
         {
             HitObject = hitObject;
-            Depth = -(float)hitObject.StartTime;
+            Depth = (float)hitObject.StartTime;
         }
 
         private ArmedState state;

osu.Game/OsuGame.cs

@@ -116,11 +116,11 @@ protected override void LoadComplete()
 
             //overlay elements
             (chat = new ChatConsole(API) { Depth = 0 }).Preload(this, overlayContent.Add);
-            (Options = new OptionsOverlay { Depth = 1 }).Preload(this, overlayContent.Add);
-            (musicController = new MusicController() { Depth = 3 }).Preload(this, overlayContent.Add);
+            (Options = new OptionsOverlay { Depth = -1 }).Preload(this, overlayContent.Add);
+            (musicController = new MusicController() { Depth = -3 }).Preload(this, overlayContent.Add);
             (Toolbar = new Toolbar
             {
-                Depth = 2,
+                Depth = -2,
                 OnHome = delegate { mainMenu?.MakeCurrent(); },
                 OnSettings = Options.ToggleVisibility,
                 OnPlayModeChange = delegate (PlayMode m) { PlayMode.Value = m; },

osu.Game/OsuGameBase.cs

@@ -83,7 +83,7 @@ protected override void LoadComplete()
             {
                 Children = new[]
                 {
-                    Cursor = new OsuCursorContainer { Depth = float.MaxValue }
+                    Cursor = new OsuCursorContainer { Depth = float.MinValue }
                 }
             });
         }

osu.Game/Overlays/ChatConsole.cs

@@ -45,7 +45,7 @@ public ChatConsole(APIAccess api)
             {
                 new Box
                 {
-                    Depth = float.MinValue,
+                    Depth = float.MaxValue,
                     RelativeSizeAxes = Axes.Both,
                     Colour = new Color4(0.1f, 0.1f, 0.1f, 0.4f),
                 },

osu.Game/Overlays/MusicController.cs

@@ -386,7 +386,7 @@ public MusicControllerBackground(WorkingBeatmap beatmap = null)
                 this.beatmap = beatmap;
                 CacheDrawnFrameBuffer = true;
                 RelativeSizeAxes = Axes.Both;
-                Depth = float.MinValue;
+                Depth = float.MaxValue;
 
                 Children = new Drawable[]
                 {

osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs

@@ -39,7 +39,7 @@ public WorkingBeatmap Beatmap
                         float newDepth = 0;
                         if (background != null)
                         {
-                            newDepth = background.Depth - 1;
+                            newDepth = background.Depth + 1;
                             background.Flush();
                             background.FadeOut(250);
                             background.Expire();

osu.Game/Screens/OsuGameMode.cs

@@ -111,7 +111,7 @@ protected override void OnEntering(GameMode last)
             {
                 AddInternal(new ParallaxContainer
                 {
-                    Depth = float.MinValue,
+                    Depth = float.MaxValue,
                     Children = new[]
                     {
                         Background = bg

osu.Game/Screens/Select/BeatmapInfoWedge.cs

@@ -50,7 +50,7 @@ public void UpdateBeatmap(WorkingBeatmap beatmap)
 
             var lastContainer = beatmapInfoContainer;
 
-            float newDepth = lastContainer?.Depth - 1 ?? 0;
+            float newDepth = lastContainer?.Depth + 1 ?? 0;
 
             BeatmapSetInfo beatmapSetInfo = beatmap.BeatmapSetInfo;
             BeatmapInfo beatmapInfo = beatmap.BeatmapInfo;

osu.Game/Screens/Select/CarouselContainer.cs

@@ -81,12 +81,12 @@ public void AddGroup(BeatmapGroup group)
             group.State = BeatmapGroupState.Collapsed;
             groups.Add(group);
 
-            group.Header.Depth = scrollableContent.Children.Count();
+            group.Header.Depth = -scrollableContent.Children.Count();
             scrollableContent.Add(group.Header);
 
             foreach (BeatmapPanel panel in group.BeatmapPanels)
             {
-                panel.Depth = scrollableContent.Children.Count();
+                panel.Depth = -scrollableContent.Children.Count();
                 scrollableContent.Add(panel);
             }