From 8c7ff583103fc083bef63278c55cbc6559ab49ca Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 14 Oct 2016 12:50:03 +0900 Subject: [PATCH 1/2] Fix regressions caused by overlay class. --- osu.Game/OsuGame.cs | 7 ------- osu.Game/Overlays/Overlay.cs | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index 05438bc470..65e7045445 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -97,7 +97,6 @@ public override void Load(BaseGame game) OnHome = delegate { MainMenu?.MakeCurrent(); }, OnSettings = Options.ToggleVisibility, OnPlayModeChange = delegate (PlayMode m) { PlayMode.Value = m; }, - Alpha = 0.001f, }, Chat = new ChatConsole(API), new VolumeControl @@ -112,12 +111,6 @@ public override void Load(BaseGame game) } }); - Toolbar.State = Visibility.Hidden; - Toolbar.Flush(); - - Chat.State = Visibility.Hidden; - Chat.Flush(); - intro.ModePushed += modeAdded; intro.Exited += modeRemoved; diff --git a/osu.Game/Overlays/Overlay.cs b/osu.Game/Overlays/Overlay.cs index 31e4c10d2a..648a78c248 100644 --- a/osu.Game/Overlays/Overlay.cs +++ b/osu.Game/Overlays/Overlay.cs @@ -3,8 +3,20 @@ namespace osu.Game.Overlays { + /// + /// An element which starts hidden and can be toggled to visible. + /// public abstract class Overlay : Container, IStateful { + public override void Load(BaseGame game) + { + base.Load(game); + + //TODO: init code using Alpha or IsVisible override to ensure we don't call Load on children before we first get unhidden. + PopOut(); + Flush(); + } + private Visibility state; public Visibility State { @@ -30,9 +42,9 @@ public Visibility State protected abstract void PopOut(); - public void ToggleVisibility() - => State = (State == Visibility.Visible ? Visibility.Hidden : Visibility.Visible); + public void ToggleVisibility() => State = (State == Visibility.Visible ? Visibility.Hidden : Visibility.Visible); } + public enum Visibility { Hidden, From cc9bc9db93e606fc0ea4d655f98fadb029dd9bea Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 14 Oct 2016 12:53:44 +0900 Subject: [PATCH 2/2] Update framework version. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index 30ff0e1a99..3629521379 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 30ff0e1a99a10e735611bb3ffa35352061f52d8a +Subproject commit 3629521379bea5d79cd41e35ad6c6dfe21b4f9e7