From 088c04a20fa32b8c42ab7bf4ecac1acb363c0d81 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 28 Jul 2019 15:32:29 +0900
Subject: [PATCH] Revert "Fix BackButton handling escape before all other
 elements (#5440)"

This reverts commit 17a6563f4c5d0c7e3a4dfac5469c65866de311aa.
---
 osu.Game/OsuGame.cs               | 5 ++---
 osu.Game/Screens/Select/Footer.cs | 5 +++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index e5099f3c2f..ceaf0c3d5e 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -404,8 +404,9 @@ namespace osu.Game
                 screenContainer = new ScalingContainer(ScalingMode.ExcludeOverlays)
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Children = new[]
+                    Children = new Drawable[]
                     {
+                        screenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both },
                         backButton = new BackButton
                         {
                             Anchor = Anchor.BottomLeft,
@@ -416,8 +417,6 @@ namespace osu.Game
                                     screenStack.Exit();
                             }
                         },
-                        screenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both },
-                        backButton.CreateProxy(),
                         logoContainer = new Container { RelativeSizeAxes = Axes.Both },
                     }
                 },
diff --git a/osu.Game/Screens/Select/Footer.cs b/osu.Game/Screens/Select/Footer.cs
index 71641cab5d..0680711f1c 100644
--- a/osu.Game/Screens/Select/Footer.cs
+++ b/osu.Game/Screens/Select/Footer.cs
@@ -9,6 +9,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Events;
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Screens.Select
@@ -102,5 +103,9 @@ namespace osu.Game.Screens.Select
 
             updateModeLight();
         }
+
+        protected override bool OnMouseDown(MouseDownEvent e) => true;
+
+        protected override bool OnClick(ClickEvent e) => true;
     }
 }