h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-21 22:27:23 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-speed-adjustments

Browse Source
This commit is contained in:
Dean Herbert 2017-08-22 17:07:31 +09:00 committed by GitHub
commit 8df72e0fec
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/OsuGame.cs
View File

@ -359,6 +359,13 @@ namespace osu.Game
{
base.UpdateAfterChildren();
// we only want to apply these restrictions when we are inside a screen stack.
// the use case for not applying is in visual/unit tests.
bool applyRestrictions = currentScreen?.AllowBeatmapRulesetChange ?? false;
Ruleset.Disabled = applyRestrictions;
Beatmap.Disabled = applyRestrictions;
mainContent.Padding = new MarginPadding { Top = ToolbarOffset };
Cursor.State = currentScreen?.HasLocalCursorDisplayed == false ? Visibility.Visible : Visibility.Hidden;

13
osu.Game/Screens/OsuScreen.cs
View File

@ -69,19 +69,6 @@ namespace osu.Game.Screens
sampleExit = audio.Sample.Get(@"UI/melodic-1");
}
protected override void Update()
{
if (!IsCurrentScreen) return;
if (ParentScreen != null)
{
// we only want to apply these restrictions when we are inside a screen stack.
// the use case for not applying is in visual/unit tests.
Ruleset.Disabled = !AllowBeatmapRulesetChange;
Beatmap.Disabled = !AllowBeatmapRulesetChange;
}
}
protected override void OnResuming(Screen last)
{
base.OnResuming(last);