From 18bb61897fc5f58cea392572047ae100cf5fa0a2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Feb 2017 12:46:53 +0900
Subject: [PATCH] Update overlay containers in lines with framework changes.

Allows closing the MusicController using escape.
---
 osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs | 2 ++
 osu.Game/Overlays/MusicController.cs                    | 4 ----
 osu.Game/Overlays/Pause/PauseOverlay.cs                 | 3 +++
 osu.Game/Overlays/Toolbar/Toolbar.cs                    | 4 ++++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs b/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
index 0e40127d3f..5f14e27441 100644
--- a/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
+++ b/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Graphics.UserInterface.Volume
     {
         private VolumeMeter volumeMeterMaster;
 
+        protected override bool HideOnEscape => false;
+
         private void volumeChanged(object sender, EventArgs e)
         {
             Show();
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 034278a2ef..521cddd7e2 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -374,10 +374,6 @@ namespace osu.Game.Overlays
             base.Dispose(isDisposing);
         }
 
-        protected override bool OnClick(InputState state) => true;
-
-        protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => true;
-
         //placeholder for toggling
         protected override void PopIn() => FadeIn(100);
 
diff --git a/osu.Game/Overlays/Pause/PauseOverlay.cs b/osu.Game/Overlays/Pause/PauseOverlay.cs
index 847b3fe55d..43365a610d 100644
--- a/osu.Game/Overlays/Pause/PauseOverlay.cs
+++ b/osu.Game/Overlays/Pause/PauseOverlay.cs
@@ -22,6 +22,8 @@ namespace osu.Game.Overlays.Pause
         private const int button_height = 70;
         private const float background_alpha = 0.75f;
 
+        protected override bool HideOnEscape => false;
+
         public Action OnResume;
         public Action OnRetry;
         public Action OnQuit;
@@ -83,6 +85,7 @@ namespace osu.Game.Overlays.Pause
                 resume();
                 return true;
             }
+
             return base.OnKeyDown(state, args);
         }
 
diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 1b6abb475c..503a3e0bf5 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -24,6 +24,10 @@ namespace osu.Game.Overlays.Toolbar
         private ToolbarModeSelector modeSelector;
         private ToolbarUserArea userArea;
 
+        protected override bool HideOnEscape => false;
+
+        protected override bool BlockPassThroughInput => false;
+
         private const int transition_time = 500;
 
         private const float alpha_hovering = 0.8f;