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

Fix HotkeyOverlay fade out occurring when exit is blocked

Browse Source
This commit is contained in:
Dean Herbert 2023-10-12 15:42:50 +09:00
parent 7c0d496730
commit 242a41371c
No known key found for this signature in database
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -279,8 +279,10 @@ namespace osu.Game.Screens.Play
{
if (!this.IsCurrentScreen()) return;
fadeOut(true);
PerformExit(false);
if (PerformExit(false))
// The hotkey overlay dims the screen.
// If the operation succeeds, we want to make sure we stay dimmed to keep continuity.
fadeOut(true);
},
},
});
@ -298,8 +300,10 @@ namespace osu.Game.Screens.Play
{
if (!this.IsCurrentScreen()) return;
fadeOut(true);
Restart(true);
if (Restart(true))
// The hotkey overlay dims the screen.
// If the operation succeeds, we want to make sure we stay dimmed to keep continuity.
fadeOut(true);
},
},
});
@ -565,7 +569,8 @@ namespace osu.Game.Screens.Play
/// Whether the pause or fail dialog should be shown before performing an exit.
/// If <see langword="true"/> and a dialog is not yet displayed, the exit will be blocked and the relevant dialog will display instead.
/// </param>
protected void PerformExit(bool showDialogFirst)
/// <returns>Whether this call resulted in a final exit.</returns>
protected bool PerformExit(bool showDialogFirst)
{
// there is a chance that an exit request occurs after the transition to results has already started.
// even in such a case, the user has shown intent, so forcefully return to this screen (to proceed with the upwards exit process).
@ -576,7 +581,7 @@ namespace osu.Game.Screens.Play
// in the potential case that this instance has already been exited, this is required to avoid a crash.
if (this.GetChildScreen() != null)
this.MakeCurrent();
return;
return true;
}
bool pauseOrFailDialogVisible =
@ -588,7 +593,7 @@ namespace osu.Game.Screens.Play
if (ValidForResume && GameplayState.HasFailed)
{
failAnimationContainer.FinishTransforms(true);
return;
return false;
}
// even if this call has requested a dialog, there is a chance the current player mode doesn't support pausing.
@ -597,16 +602,16 @@ namespace osu.Game.Screens.Play
// in the case a dialog needs to be shown, attempt to pause and show it.
// this may fail (see internal checks in Pause()) but the fail cases are temporary, so don't fall through to Exit().
Pause();
return;
return false;
}
}
// Matching osu!stable behaviour, if the results screen is pending and the user requests an exit,
// show the results instead.
if (resultsDisplayDelegate != null)
if (resultsDisplayDelegate != null && !isRestarting)
{
progressToResults(false);
return;
return false;
}
// import current score if possible.
@ -617,6 +622,7 @@ namespace osu.Game.Screens.Play
// - the pause / fail dialog was requested but is already displayed (user showing intention to exit).
// - the pause / fail dialog was requested but couldn't be displayed due to the type or state of this Player instance.
this.Exit();
return true;
}
private void performUserRequestedSkip()
@ -665,10 +671,10 @@ namespace osu.Game.Screens.Play
/// <remarks>This can be called from a child screen in order to trigger the restart process.</remarks>
/// </summary>
/// <param name="quickRestart">Whether a quick restart was requested (skipping intro etc.).</param>
public void Restart(bool quickRestart = false)
public bool Restart(bool quickRestart = false)
{
if (!Configuration.AllowRestart)
return;
return false;
isRestarting = true;
@ -678,7 +684,7 @@ namespace osu.Game.Screens.Play
RestartRequested?.Invoke(quickRestart);
PerformExit(false);
return PerformExit(false);
}
/// <summary>
@ -1205,8 +1211,11 @@ namespace osu.Game.Screens.Play
float fadeOutDuration = instant ? 0 : 250;
this.FadeOut(fadeOutDuration);
ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
storyboardReplacesBackground.Value = false;
if (this.IsCurrentScreen())
{
ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
storyboardReplacesBackground.Value = false;
}
}
#endregion