diff --git a/osu.Game/Overlays/Dialog/ConfirmDialog.cs b/osu.Game/Overlays/Dialog/ConfirmDialog.cs
index 6f160daf97..a87c06ffdf 100644
--- a/osu.Game/Overlays/Dialog/ConfirmDialog.cs
+++ b/osu.Game/Overlays/Dialog/ConfirmDialog.cs
@@ -11,30 +11,27 @@ namespace osu.Game.Overlays.Dialog
///
public class ConfirmDialog : PopupDialog
{
- protected PopupDialogOkButton ButtonConfirm;
- protected PopupDialogCancelButton ButtonCancel;
-
///
- /// Construct a new dialog.
+ /// Construct a new confirmation dialog.
///
- /// The description of the action to be displayed to the user.
+ /// The description of the action to be displayed to the user.
/// An action to perform on confirmation.
/// An optional action to perform on cancel.
- public ConfirmDialog(string description, Action onConfirm, Action onCancel = null)
+ public ConfirmDialog(string message, Action onConfirm, Action onCancel = null)
{
- HeaderText = $"Are you sure you want to {description}?";
- BodyText = "Last chance to back out.";
+ HeaderText = message;
+ BodyText = "Last chance to turn back";
Icon = FontAwesome.Solid.ExclamationTriangle;
Buttons = new PopupDialogButton[]
{
- ButtonConfirm = new PopupDialogOkButton
+ new PopupDialogOkButton
{
Text = @"Yes",
Action = onConfirm
},
- ButtonCancel = new PopupDialogCancelButton
+ new PopupDialogCancelButton
{
Text = @"Cancel",
Action = onCancel
diff --git a/osu.Game/Screens/Menu/ConfirmExitDialog.cs b/osu.Game/Screens/Menu/ConfirmExitDialog.cs
index 41cc7b480c..6488a2fd63 100644
--- a/osu.Game/Screens/Menu/ConfirmExitDialog.cs
+++ b/osu.Game/Screens/Menu/ConfirmExitDialog.cs
@@ -2,17 +2,38 @@
// See the LICENCE file in the repository root for full licence text.
using System;
+using osu.Framework.Graphics.Sprites;
using osu.Game.Overlays.Dialog;
namespace osu.Game.Screens.Menu
{
- public class ConfirmExitDialog : ConfirmDialog
+ public class ConfirmExitDialog : PopupDialog
{
- public ConfirmExitDialog(Action confirm, Action onCancel = null)
- : base("exit osu!", confirm, onCancel)
+ ///
+ /// Construct a new exit confirmation dialog.
+ ///
+ /// An action to perform on confirmation.
+ /// An optional action to perform on cancel.
+ public ConfirmExitDialog(Action onConfirm, Action onCancel = null)
{
- ButtonConfirm.Text = "Let me out!";
- ButtonCancel.Text = "Just a little more...";
+ HeaderText = "Are you sure you want to exit osu!?";
+ BodyText = "Last chance to turn back";
+
+ Icon = FontAwesome.Solid.ExclamationTriangle;
+
+ Buttons = new PopupDialogButton[]
+ {
+ new PopupDialogOkButton
+ {
+ Text = @"Let me out!",
+ Action = onConfirm
+ },
+ new PopupDialogCancelButton
+ {
+ Text = @"Just a little more...",
+ Action = onCancel
+ },
+ };
}
}
}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index f1d8bf97fd..5a9a26d997 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -302,7 +302,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
if (!exitConfirmed && dialogOverlay != null)
{
- dialogOverlay.Push(new ConfirmDialog("leave this multiplayer match", () =>
+ dialogOverlay.Push(new ConfirmDialog("Are you sure you want to leave this multiplayer match?", () =>
{
exitConfirmed = true;
this.Exit();