diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneHoldToConfirmOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneHoldToConfirmOverlay.cs
index f787754aa4..d4143f3f8d 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneHoldToConfirmOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneHoldToConfirmOverlay.cs
@@ -61,10 +61,7 @@ namespace osu.Game.Tests.Visual.UserInterface
private class TestHoldToConfirmOverlay : ExitConfirmOverlay
{
- protected override bool AllowMultipleFires => true;
-
public void Begin() => BeginConfirm();
- public void Abort() => AbortConfirm();
}
}
}
diff --git a/osu.Game/Graphics/Containers/HoldToConfirmContainer.cs b/osu.Game/Graphics/Containers/HoldToConfirmContainer.cs
index a345fb554f..5d549ba217 100644
--- a/osu.Game/Graphics/Containers/HoldToConfirmContainer.cs
+++ b/osu.Game/Graphics/Containers/HoldToConfirmContainer.cs
@@ -16,7 +16,11 @@ namespace osu.Game.Graphics.Containers
private const int fadeout_delay = 200;
- private bool fired;
+ ///
+ /// Whether currently in a fired state (and the confirm has been sent).
+ ///
+ public bool Fired { get; private set; }
+
private bool confirming;
///
@@ -36,7 +40,7 @@ namespace osu.Game.Graphics.Containers
protected void BeginConfirm()
{
- if (confirming || (!AllowMultipleFires && fired)) return;
+ if (confirming || (!AllowMultipleFires && Fired)) return;
confirming = true;
@@ -46,14 +50,15 @@ namespace osu.Game.Graphics.Containers
protected virtual void Confirm()
{
Action?.Invoke();
- fired = true;
+ Fired = true;
}
protected void AbortConfirm()
{
- if (!AllowMultipleFires && fired) return;
+ if (!AllowMultipleFires && Fired) return;
confirming = false;
+ Fired = false;
this.TransformBindableTo(Progress, 0, fadeout_delay, Easing.Out);
}
diff --git a/osu.Game/Overlays/DialogOverlay.cs b/osu.Game/Overlays/DialogOverlay.cs
index 6aaeff8554..59d748bc5d 100644
--- a/osu.Game/Overlays/DialogOverlay.cs
+++ b/osu.Game/Overlays/DialogOverlay.cs
@@ -13,7 +13,8 @@ namespace osu.Game.Overlays
public class DialogOverlay : OsuFocusedOverlayContainer
{
private readonly Container dialogContainer;
- private PopupDialog currentDialog;
+
+ public PopupDialog CurrentDialog { get; private set; }
public DialogOverlay()
{
@@ -31,15 +32,15 @@ namespace osu.Game.Overlays
public void Push(PopupDialog dialog)
{
- if (dialog == currentDialog) return;
+ if (dialog == CurrentDialog) return;
- currentDialog?.Hide();
- currentDialog = dialog;
+ CurrentDialog?.Hide();
+ CurrentDialog = dialog;
- dialogContainer.Add(currentDialog);
+ dialogContainer.Add(CurrentDialog);
- currentDialog.Show();
- currentDialog.State.ValueChanged += state => onDialogOnStateChanged(dialog, state.NewValue);
+ CurrentDialog.Show();
+ CurrentDialog.State.ValueChanged += state => onDialogOnStateChanged(dialog, state.NewValue);
Show();
}
@@ -52,8 +53,11 @@ namespace osu.Game.Overlays
//handle the dialog being dismissed.
dialog.Delay(PopupDialog.EXIT_DURATION).Expire();
- if (dialog == currentDialog)
+ if (dialog == CurrentDialog)
+ {
Hide();
+ CurrentDialog = null;
+ }
}
protected override void PopIn()
@@ -66,9 +70,9 @@ namespace osu.Game.Overlays
{
base.PopOut();
- if (currentDialog?.State.Value == Visibility.Visible)
+ if (CurrentDialog?.State.Value == Visibility.Visible)
{
- currentDialog.Hide();
+ CurrentDialog.Hide();
return;
}
@@ -80,7 +84,7 @@ namespace osu.Game.Overlays
switch (action)
{
case GlobalAction.Select:
- currentDialog?.Buttons.OfType().FirstOrDefault()?.Click();
+ CurrentDialog?.Buttons.OfType().FirstOrDefault()?.Click();
return true;
}
diff --git a/osu.Game/Screens/Menu/ExitConfirmOverlay.cs b/osu.Game/Screens/Menu/ExitConfirmOverlay.cs
index 519834859d..aaa3a77e74 100644
--- a/osu.Game/Screens/Menu/ExitConfirmOverlay.cs
+++ b/osu.Game/Screens/Menu/ExitConfirmOverlay.cs
@@ -9,6 +9,10 @@ namespace osu.Game.Screens.Menu
{
public class ExitConfirmOverlay : HoldToConfirmOverlay, IKeyBindingHandler
{
+ protected override bool AllowMultipleFires => true;
+
+ public void Abort() => AbortConfirm();
+
public bool OnPressed(GlobalAction action)
{
if (action == GlobalAction.Back)
@@ -24,7 +28,8 @@ namespace osu.Game.Screens.Menu
{
if (action == GlobalAction.Back)
{
- AbortConfirm();
+ if (!Fired)
+ AbortConfirm();
return true;
}
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 2d8c48873a..23fb2d8e37 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -64,11 +64,13 @@ namespace osu.Game.Screens.Menu
private Bindable holdDelay;
+ private ExitConfirmOverlay exitConfirmOverlay;
+
[BackgroundDependencyLoader(true)]
private void load(DirectOverlay direct, SettingsOverlay settings, OsuConfigManager config)
{
if (host.CanExit)
- AddInternal(new ExitConfirmOverlay { Action = this.Exit });
+ AddInternal(exitConfirmOverlay = new ExitConfirmOverlay { Action = this.Exit });
holdDelay = config.GetBindable(OsuSetting.UIHoldActivationDelay);
@@ -237,12 +239,15 @@ namespace osu.Game.Screens.Menu
public override bool OnExiting(IScreen next)
{
- if (holdDelay.Value == 0 && !exitConfirmed && dialogOverlay != null)
+ if (holdDelay.Value == 0 && !exitConfirmed && dialogOverlay != null && !(dialogOverlay.CurrentDialog is ConfirmExitDialog))
{
dialogOverlay.Push(new ConfirmExitDialog(() =>
{
exitConfirmed = true;
this.Exit();
+ }, () =>
+ {
+ exitConfirmOverlay.Abort();
}));
return true;
@@ -253,9 +258,9 @@ namespace osu.Game.Screens.Menu
return base.OnExiting(next);
}
- public class ConfirmExitDialog : PopupDialog
+ private class ConfirmExitDialog : PopupDialog
{
- public ConfirmExitDialog(Action confirm)
+ public ConfirmExitDialog(Action confirm, Action cancel)
{
HeaderText = "Are you sure you want to exit?";
BodyText = "Last chance to back out.";
@@ -271,7 +276,8 @@ namespace osu.Game.Screens.Menu
},
new PopupDialogCancelButton
{
- Text = @"Just a little more"
+ Text = @"Just a little more",
+ Action = cancel
},
};
}