From 0f5bce70ad4eec310f54113341e747e552b2a4e4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 20:34:36 +0900
Subject: [PATCH] Split confirmation dialog classes apart

---
 osu.Game/Overlays/Dialog/ConfirmDialog.cs     | 17 +++++-----
 osu.Game/Screens/Menu/ConfirmExitDialog.cs    | 31 ++++++++++++++++---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  |  2 +-
 3 files changed, 34 insertions(+), 16 deletions(-)

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
     /// </summary>
     public class ConfirmDialog : PopupDialog
     {
-        protected PopupDialogOkButton ButtonConfirm;
-        protected PopupDialogCancelButton ButtonCancel;
-
         /// <summary>
-        /// Construct a new dialog.
+        /// Construct a new confirmation dialog.
         /// </summary>
-        /// <param name="description">The description of the action to be displayed to the user.</param>
+        /// <param name="message">The description of the action to be displayed to the user.</param>
         /// <param name="onConfirm">An action to perform on confirmation.</param>
         /// <param name="onCancel">An optional action to perform on cancel.</param>
-        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)
+        /// <summary>
+        /// Construct a new exit confirmation dialog.
+        /// </summary>
+        /// <param name="onConfirm">An action to perform on confirmation.</param>
+        /// <param name="onCancel">An optional action to perform on cancel.</param>
+        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();