From 1f95abf7c79efb99a885357f04390c1eb7e4a8c5 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Tue, 19 Mar 2019 21:30:24 -0700
Subject: [PATCH] Fix regressions caused by removing specified depths

- urgentOverlayContent is added so toolbar can be loaded first
---
 osu.Game/OsuGame.cs | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index facc616136..f952f92f81 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -401,6 +401,7 @@ namespace osu.Game
                 },
                 overlayContent = new Container { RelativeSizeAxes = Axes.Both },
                 floatingOverlayContent = new Container { RelativeSizeAxes = Axes.Both },
+                urgentOverlayContent = new Container { RelativeSizeAxes = Axes.Both },
                 idleTracker = new GameIdleTracker(6000)
             });
 
@@ -420,7 +421,7 @@ namespace osu.Game
                     CloseAllOverlays(false);
                     menuScreen?.MakeCurrent();
                 },
-            }, floatingOverlayContent.Add);
+            }, urgentOverlayContent.Add);
 
             loadComponentSingleFile(volume = new VolumeOverlay(), floatingOverlayContent.Add);
             loadComponentSingleFile(onscreenDisplay = new OnScreenDisplay(), Add);
@@ -435,13 +436,6 @@ namespace osu.Game
             loadComponentSingleFile(settings = new MainSettings { GetToolbarHeight = () => ToolbarOffset }, floatingOverlayContent.Add);
             loadComponentSingleFile(userProfile = new UserProfileOverlay(), overlayContent.Add);
             loadComponentSingleFile(beatmapSetOverlay = new BeatmapSetOverlay(), overlayContent.Add);
-            loadComponentSingleFile(musicController = new MusicController
-            {
-                Position = new Vector2(0, Toolbar.HEIGHT),
-                Anchor = Anchor.TopRight,
-                Origin = Anchor.TopRight,
-            }, floatingOverlayContent.Add);
-
             loadComponentSingleFile(notifications = new NotificationOverlay
             {
                 GetToolbarHeight = () => ToolbarOffset,
@@ -449,11 +443,18 @@ namespace osu.Game
                 Origin = Anchor.TopRight,
             }, floatingOverlayContent.Add);
 
-            loadComponentSingleFile(accountCreation = new AccountCreationOverlay(), floatingOverlayContent.Add);
+            loadComponentSingleFile(musicController = new MusicController
+            {
+                Position = new Vector2(0, Toolbar.HEIGHT),
+                Anchor = Anchor.TopRight,
+                Origin = Anchor.TopRight,
+            }, floatingOverlayContent.Add);
 
-            loadComponentSingleFile(dialogOverlay = new DialogOverlay(), floatingOverlayContent.Add);
+            loadComponentSingleFile(accountCreation = new AccountCreationOverlay(), urgentOverlayContent.Add);
 
-            loadComponentSingleFile(externalLinkOpener = new ExternalLinkOpener(), floatingOverlayContent.Add);
+            loadComponentSingleFile(dialogOverlay = new DialogOverlay(), urgentOverlayContent.Add);
+
+            loadComponentSingleFile(externalLinkOpener = new ExternalLinkOpener(), urgentOverlayContent.Add);
 
             dependencies.CacheAs(idleTracker);
             dependencies.Cache(settings);
@@ -699,6 +700,8 @@ namespace osu.Game
 
         private Container floatingOverlayContent;
 
+        private Container urgentOverlayContent;
+
         private FrameworkConfigManager frameworkConfig;
         private ScalingContainer screenContainer;