From bad30d9e602537a6e2afbfb41333d89d9235a4c4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 11 Apr 2022 21:05:37 +0300
Subject: [PATCH] Fix dialog dangerous button being clickable at edges

---
 .../Dialog/PopupDialogDangerousButton.cs      | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Overlays/Dialog/PopupDialogDangerousButton.cs b/osu.Game/Overlays/Dialog/PopupDialogDangerousButton.cs
index 1911a4fa56..adc627e15b 100644
--- a/osu.Game/Overlays/Dialog/PopupDialogDangerousButton.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialogDangerousButton.cs
@@ -12,37 +12,38 @@ namespace osu.Game.Overlays.Dialog
 {
     public class PopupDialogDangerousButton : PopupDialogButton
     {
+        private Box progressBox;
+        private DangerousConfirmContainer confirmContainer;
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
             ButtonColour = colours.Red3;
 
-            ColourContainer.Add(new ConfirmFillBox
+            ColourContainer.Add(progressBox = new Box
             {
-                Action = () => Action(),
                 RelativeSizeAxes = Axes.Both,
                 Blending = BlendingParameters.Additive,
             });
+
+            AddInternal(confirmContainer = new DangerousConfirmContainer
+            {
+                Action = () => Action(),
+                RelativeSizeAxes = Axes.Both,
+            });
         }
 
-        private class ConfirmFillBox : HoldToConfirmContainer
+        protected override void LoadComplete()
         {
-            private Box box;
+            base.LoadComplete();
 
+            confirmContainer.Progress.BindValueChanged(progress => progressBox.Width = (float)progress.NewValue, true);
+        }
+
+        private class DangerousConfirmContainer : HoldToConfirmContainer
+        {
             protected override double? HoldActivationDelay => 500;
 
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                Child = box = new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                };
-
-                Progress.BindValueChanged(progress => box.Width = (float)progress.NewValue, true);
-            }
-
             protected override bool OnMouseDown(MouseDownEvent e)
             {
                 BeginConfirm();