sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-25 15:37:24 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fixed test case

Browse Source
This commit is contained in:
MrTheMake 2017-06-19 14:52:36 +02:00
parent 5450499415
commit 13df0e0b04
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/OsuGame.cs
View File

@ -298,8 +298,6 @@ namespace osu.Game
private Container overlayContent; private Container overlayContent;
public readonly Bindable<OsuScreen> CurrentScreen = new Bindable<OsuScreen>();
private FrameworkConfigManager frameworkConfig; private FrameworkConfigManager frameworkConfig;
private void screenChanged(Screen newScreen) private void screenChanged(Screen newScreen)

3
osu.Game/OsuGameBase.cs
View File

@ -18,6 +18,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Cursor; using osu.Game.Graphics.Cursor;
using osu.Game.Graphics.Processing; using osu.Game.Graphics.Processing;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Screens;
using SQLite.Net; using SQLite.Net;
using osu.Framework.Graphics.Performance; using osu.Framework.Graphics.Performance;
@ -45,6 +46,8 @@ namespace osu.Game
public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>(); public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
public readonly Bindable<OsuScreen> CurrentScreen = new Bindable<OsuScreen>();
private Bindable<bool> fpsDisplayVisible; private Bindable<bool> fpsDisplayVisible;
protected AssemblyName AssemblyName => Assembly.GetEntryAssembly()?.GetName() ?? new AssemblyName { Version = new Version() }; protected AssemblyName AssemblyName => Assembly.GetEntryAssembly()?.GetName() ?? new AssemblyName { Version = new Version() };

4
osu.Game/Overlays/MusicController.cs
View File

@ -88,7 +88,7 @@ namespace osu.Game.Overlays
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuGame game, OsuColour colours, LocalisationEngine localisation) private void load(OsuGameBase game, OsuColour colours, LocalisationEngine localisation)
{ {
this.localisation = localisation; this.localisation = localisation;
@ -222,7 +222,7 @@ namespace osu.Game.Overlays
private void screenChanged(OsuScreen newScreen) private void screenChanged(OsuScreen newScreen)
{ {
canChangeBeatmap = newScreen?.CanChangeBeatmap ?? false; canChangeBeatmap = newScreen?.CanChangeBeatmap ?? true;
prevButton.Enabled = canChangeBeatmap; prevButton.Enabled = canChangeBeatmap;
playButton.Enabled = canChangeBeatmap; playButton.Enabled = canChangeBeatmap;