sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 06:36:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix TestCasePlayerLoader not having a background stack

Browse Source
This commit is contained in:
David Zhao
2019-02-25 22:05:49 +09:00
parent 16fa30f71e
commit d750023c52
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Screens/Play/PlayerLoader.cs
View File

@ -159,7 +159,7 @@ namespace osu.Game.Screens.Play
{
// restore our screen defaults
InitializeBackgroundElements();
if (this.IsCurrentScreen() && (Background?.IsLoaded ?? false))
if (this.IsCurrentScreen())
Background.EnableUserDim.Value = false;
return base.OnHover(e);
}
@ -168,7 +168,8 @@ namespace osu.Game.Screens.Play
{
if (GetContainingInputManager()?.HoveredDrawables.Contains(VisualSettings) == true)
{
// show user setting preview
// Update background elements is only being called here because blur logic still exists in Player.
// Will need to be removed when resolving https://github.com/ppy/osu/issues/4322
UpdateBackgroundElements();
if (this.IsCurrentScreen())
Background.EnableUserDim.Value = true;
@ -245,8 +246,7 @@ namespace osu.Game.Screens.Play
this.FadeOut(150);
cancelLoad();
if (Background != null)
Background.EnableUserDim.Value = false;
Background.EnableUserDim.Value = false;
return base.OnExiting(next);
}