Merge pull request #17776 from frenzibyte/dangerous-dialog-button-bounds

Fix dialog dangerous button being clickable at edges

osu.Game.Tests/Visual/UserInterface/TestScenePopupDialog.cs

@@ -4,25 +4,58 @@
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Testing;
 using osu.Game.Overlays.Dialog;
+using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    [TestFixture]
+    public class TestScenePopupDialog : OsuManualInputManagerTestScene
-    public class TestScenePopupDialog : OsuTestScene
     {
-        public TestScenePopupDialog()
+        private TestPopupDialog dialog;
+
+        [SetUpSteps]
+        public void SetUpSteps()
         {
             AddStep("new popup", () =>
-                Add(new TestPopupDialog
+            {
+                Add(dialog = new TestPopupDialog
                 {
                     RelativeSizeAxes = Axes.Both,
                     State = { Value = Framework.Graphics.Containers.Visibility.Visible },
-                }));
+                });
+            });
+        }
+
+        [Test]
+        public void TestDangerousButton([Values(false, true)] bool atEdge)
+        {
+            if (atEdge)
+            {
+                AddStep("move mouse to button edge", () =>
+                {
+                    var dangerousButtonQuad = dialog.DangerousButton.ScreenSpaceDrawQuad;
+                    InputManager.MoveMouseTo(new Vector2(dangerousButtonQuad.TopLeft.X + 5, dangerousButtonQuad.Centre.Y));
+                });
+            }
+            else
+                AddStep("move mouse to button", () => InputManager.MoveMouseTo(dialog.DangerousButton));
+
+            AddStep("click button", () => InputManager.Click(MouseButton.Left));
+            AddAssert("action not invoked", () => !dialog.DangerousButtonInvoked);
+
+            AddStep("hold button", () => InputManager.PressButton(MouseButton.Left));
+            AddUntilStep("action invoked", () => dialog.DangerousButtonInvoked);
+            AddStep("release button", () => InputManager.ReleaseButton(MouseButton.Left));
         }
 
         private class TestPopupDialog : PopupDialog
         {
+            public PopupDialogDangerousButton DangerousButton { get; }
+
+            public bool DangerousButtonInvoked;
+
             public TestPopupDialog()
             {
                 Icon = FontAwesome.Solid.AssistiveListeningSystems;
@@ -40,9 +73,10 @@ namespace osu.Game.Tests.Visual.UserInterface
                     {
                         Text = @"You're a fake!",
                     },
-                    new PopupDialogDangerousButton
+                    DangerousButton = new PopupDialogDangerousButton
                     {
                         Text = @"Careful with this one..",
+                        Action = () => DangerousButtonInvoked = true,
                     },
                 };
             }

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();