RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix discrepancies in how elements of play mode fade when restarting/exiting

This commit is contained in:
Dean Herbert 2018-08-02 19:08:23 +09:00
parent 1ed6b23306
commit 7097ecb740
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,7 +213,7 @@ private void load(AudioManager audio, APIAccess api, OsuConfigManager config)
{
if (!IsCurrentScreen) return;
pauseContainer.Hide();
fadeOut(true);
Restart();
},
}
@ -364,16 +364,10 @@ protected override bool OnExiting(Screen next)
return true;
}
private void fadeOut()
private void fadeOut(bool instant = false)
{
const float fade_out_duration = 250;
RulesetContainer?.FadeOut(fade_out_duration);
Content.FadeOut(fade_out_duration);
hudOverlay?.ScaleTo(0.7f, fade_out_duration * 3, Easing.In);
Background?.FadeTo(1f, fade_out_duration);
float fadeOutDuration = instant ? 0 : 250;
Content.FadeOut(fadeOutDuration);
}
protected override bool OnScroll(InputState state) => mouseWheelDisabled.Value && !pauseContainer.IsPaused;