From 727086c0b2532bd8618897c95954a2ed9d08e6b2 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 18 Apr 2017 15:34:53 +0900 Subject: [PATCH 1/2] Updates in-line with framework. --- osu.Game/Overlays/Toolbar/Toolbar.cs | 2 +- osu.Game/Screens/Play/MenuOverlay.cs | 2 ++ osu.Game/Screens/Select/BeatmapInfoWedge.cs | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs index 4632b55775..e1495827f9 100644 --- a/osu.Game/Overlays/Toolbar/Toolbar.cs +++ b/osu.Game/Overlays/Toolbar/Toolbar.cs @@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Toolbar protected override bool HideOnEscape => false; - protected override bool BlockPassThroughInput => false; + protected override bool BlockPassThroughMouse => false; private const double transition_time = 500; diff --git a/osu.Game/Screens/Play/MenuOverlay.cs b/osu.Game/Screens/Play/MenuOverlay.cs index 738e5cc35d..fa522956f7 100644 --- a/osu.Game/Screens/Play/MenuOverlay.cs +++ b/osu.Game/Screens/Play/MenuOverlay.cs @@ -25,6 +25,8 @@ namespace osu.Game.Screens.Play protected override bool HideOnEscape => false; + protected override bool BlockPassThroughKeyboard => true; + public Action OnRetry; public Action OnQuit; diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs index d15e5a9bb8..cc225659b4 100644 --- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs +++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs @@ -47,7 +47,7 @@ namespace osu.Game.Screens.Select protected override bool HideOnEscape => false; - protected override bool BlockPassThroughInput => false; + protected override bool BlockPassThroughMouse => false; protected override void PopIn() { From 6dc15963e09fdab3b149ac03d9486010f978a1ab Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 18 Apr 2017 16:15:16 +0900 Subject: [PATCH 2/2] Update framework. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index 979fb1ffdf..21a97586f7 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 979fb1ffdfaa08c39ff4f0cdda42e5b313d70534 +Subproject commit 21a97586f7fa8d9aa65b4131824151d88a70b520