From d846246ef2f08fbe9f7112aba828e0aa35f7dbb6 Mon Sep 17 00:00:00 2001 From: Dean Herbert <pe@ppy.sh> Date: Tue, 15 Nov 2016 20:43:43 +0900 Subject: [PATCH] ShowToolbar -> ShowOverlays; include MusicController. --- osu.Game/OsuGame.cs | 3 ++- osu.Game/Screens/Menu/Intro.cs | 2 +- osu.Game/Screens/Menu/MainMenu.cs | 2 +- osu.Game/Screens/OsuGameMode.cs | 4 ++-- osu.Game/Screens/Play/Player.cs | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index 8e7b983de4..4f40899500 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -175,9 +175,10 @@ namespace osu.Game // - Frame limiter changes //central game mode change logic. - if ((newMode as OsuGameMode)?.ShowToolbar != true) + if ((newMode as OsuGameMode)?.ShowOverlays != true) { Toolbar.State = Visibility.Hidden; + musicController.State = Visibility.Hidden; chat.State = Visibility.Hidden; } else diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs index 4875c8b7eb..4474ee8024 100644 --- a/osu.Game/Screens/Menu/Intro.cs +++ b/osu.Game/Screens/Menu/Intro.cs @@ -26,7 +26,7 @@ namespace osu.Game.Screens.Menu private AudioSample welcome; private AudioTrack bgm; - internal override bool ShowToolbar => (ParentGameMode as OsuGameMode)?.ShowToolbar ?? false; + internal override bool ShowOverlays => (ParentGameMode as OsuGameMode)?.ShowOverlays ?? false; protected override BackgroundMode CreateBackground() => new BackgroundModeEmpty(); diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs index 8ab8596cd6..055a4baf9d 100644 --- a/osu.Game/Screens/Menu/MainMenu.cs +++ b/osu.Game/Screens/Menu/MainMenu.cs @@ -23,7 +23,7 @@ namespace osu.Game.Screens.Menu private ButtonSystem buttons; public override string Name => @"Main Menu"; - internal override bool ShowToolbar => true; + internal override bool ShowOverlays => true; private BackgroundMode background; diff --git a/osu.Game/Screens/OsuGameMode.cs b/osu.Game/Screens/OsuGameMode.cs index b919e257d4..51b8c7d7cf 100644 --- a/osu.Game/Screens/OsuGameMode.cs +++ b/osu.Game/Screens/OsuGameMode.cs @@ -20,11 +20,11 @@ namespace osu.Game.Screens /// </summary> protected virtual BackgroundMode CreateBackground() => null; - internal virtual bool ShowToolbar => true; + internal virtual bool ShowOverlays => true; protected new OsuGameBase Game => base.Game as OsuGameBase; - protected float ToolbarPadding => ShowToolbar ? (Game as OsuGame)?.Toolbar.DrawHeight ?? 0 : 0; + protected float ToolbarPadding => ShowOverlays ? (Game as OsuGame)?.Toolbar.DrawHeight ?? 0 : 0; private bool boundToBeatmap; private Bindable<WorkingBeatmap> beatmap; diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs index 8bc1a3d151..39d477ea76 100644 --- a/osu.Game/Screens/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -26,7 +26,7 @@ namespace osu.Game.Screens.Play protected override BackgroundMode CreateBackground() => new BackgroundModeCustom(@"Backgrounds/bg4"); - internal override bool ShowToolbar => false; + internal override bool ShowOverlays => false; public BeatmapInfo BeatmapInfo;