From bbcc8f072116e52e5105bc241166a4396d3b9af5 Mon Sep 17 00:00:00 2001
From: David Zhao <nyquill@ppy.sh>
Date: Thu, 25 Jul 2019 11:11:20 +0900
Subject: [PATCH] Add new container level and unblock footer

---
 osu.Game/OsuGame.cs               | 33 +++++++++++++++++++------------
 osu.Game/Screens/Select/Footer.cs |  4 ++--
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 6fb76c640f..a248da4304 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -395,16 +395,6 @@ protected override void LoadComplete()
 
             AddRange(new Drawable[]
             {
-                backButton = new BackButton
-                {
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft,
-                    Action = () =>
-                    {
-                        if ((screenStack.CurrentScreen as IOsuScreen)?.AllowBackButton == true)
-                            screenStack.Exit();
-                    }
-                },
                 new VolumeControlReceptor
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -416,9 +406,26 @@ protected override void LoadComplete()
                     RelativeSizeAxes = Axes.Both,
                     Children = new[]
                     {
-                        screenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both },
-                        backButton.CreateProxy(),
-                        logoContainer = new Container { RelativeSizeAxes = Axes.Both },
+                        backButton = new BackButton
+                        {
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                            Action = () =>
+                            {
+                                if ((screenStack.CurrentScreen as IOsuScreen)?.AllowBackButton == true)
+                                    screenStack.Exit();
+                            }
+                        },
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Children = new[]
+                            {
+                                screenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both },
+                                backButton.CreateProxy(),
+                                logoContainer = new Container { RelativeSizeAxes = Axes.Both },
+                            }
+                        }
                     }
                 },
                 overlayContent = new Container { RelativeSizeAxes = Axes.Both },
diff --git a/osu.Game/Screens/Select/Footer.cs b/osu.Game/Screens/Select/Footer.cs
index 0680711f1c..0043acb818 100644
--- a/osu.Game/Screens/Select/Footer.cs
+++ b/osu.Game/Screens/Select/Footer.cs
@@ -104,8 +104,8 @@ public Footer()
             updateModeLight();
         }
 
-        protected override bool OnMouseDown(MouseDownEvent e) => true;
+        protected override bool OnMouseDown(MouseDownEvent e) => false;
 
-        protected override bool OnClick(ClickEvent e) => true;
+        protected override bool OnClick(ClickEvent e) => false;
     }
 }