sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

ShowToolbar -> ShowOverlays; include MusicController.

Browse Source
This commit is contained in:
Dean Herbert
2016-11-15 20:43:43 +09:00
parent 2af839cdbd
commit d846246ef2
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/OsuGame.cs
View File

@ -175,9 +175,10 @@ namespace osu.Game
// - Frame limiter changes // - Frame limiter changes
//central game mode change logic. //central game mode change logic.
if ((newMode as OsuGameMode)?.ShowToolbar != true) if ((newMode as OsuGameMode)?.ShowOverlays != true)
{ {
Toolbar.State = Visibility.Hidden; Toolbar.State = Visibility.Hidden;
musicController.State = Visibility.Hidden;
chat.State = Visibility.Hidden; chat.State = Visibility.Hidden;
} }
else else

2
osu.Game/Screens/Menu/Intro.cs
View File

@ -26,7 +26,7 @@ namespace osu.Game.Screens.Menu
private AudioSample welcome; private AudioSample welcome;
private AudioTrack bgm; 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(); protected override BackgroundMode CreateBackground() => new BackgroundModeEmpty();

2
osu.Game/Screens/Menu/MainMenu.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Screens.Menu
private ButtonSystem buttons; private ButtonSystem buttons;
public override string Name => @"Main Menu"; public override string Name => @"Main Menu";
internal override bool ShowToolbar => true; internal override bool ShowOverlays => true;
private BackgroundMode background; private BackgroundMode background;

4
osu.Game/Screens/OsuGameMode.cs
View File

@ -20,11 +20,11 @@ namespace osu.Game.Screens
/// </summary> /// </summary>
protected virtual BackgroundMode CreateBackground() => null; protected virtual BackgroundMode CreateBackground() => null;
internal virtual bool ShowToolbar => true; internal virtual bool ShowOverlays => true;
protected new OsuGameBase Game => base.Game as OsuGameBase; 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 bool boundToBeatmap;
private Bindable<WorkingBeatmap> beatmap; private Bindable<WorkingBeatmap> beatmap;

2
osu.Game/Screens/Play/Player.cs
View File

@ -26,7 +26,7 @@ namespace osu.Game.Screens.Play
protected override BackgroundMode CreateBackground() => new BackgroundModeCustom(@"Backgrounds/bg4"); protected override BackgroundMode CreateBackground() => new BackgroundModeCustom(@"Backgrounds/bg4");
internal override bool ShowToolbar => false; internal override bool ShowOverlays => false;
public BeatmapInfo BeatmapInfo; public BeatmapInfo BeatmapInfo;