From cebd5f6dc2384d6468f56f31385cda8e7c035d0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 20 Dec 2022 20:36:27 +0100
Subject: [PATCH] Fix restore default button having a minuscule hit area

Another casualty of edc78205d5312e9278f2a22ef156fd34af492595. This
particular button was actually *relying* on receiving positional events
from its entire bounding box rather than `Content`, in order for the
button to be htitable more easily, which broke as other buttons were
fixed to behave more in line with expectations.

Upon closer inspection this is another case of a weird carried-over
construction. The button doesn't really need to inherit `OsuButton` or
do any of the arcane stuff that it was doing, so it's now a plain
`OsuClickableContainer` with less `Content` hackery.
---
 .../Overlays/RestoreDefaultValueButton.cs     | 41 ++++++++++++++-----
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/RestoreDefaultValueButton.cs b/osu.Game/Overlays/RestoreDefaultValueButton.cs
index 24dec44588..9d5e5db6e6 100644
--- a/osu.Game/Overlays/RestoreDefaultValueButton.cs
+++ b/osu.Game/Overlays/RestoreDefaultValueButton.cs
@@ -7,18 +7,20 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osuTK;
 
 namespace osu.Game.Overlays
 {
-    public partial class RestoreDefaultValueButton<T> : OsuButton, IHasTooltip, IHasCurrentValue<T>
+    public partial class RestoreDefaultValueButton<T> : OsuClickableContainer, IHasCurrentValue<T>
     {
         public override bool IsPresent => base.IsPresent || Scheduler.HasPendingTasks;
 
@@ -51,15 +53,32 @@ namespace osu.Game.Overlays
 
         private const float size = 4;
 
+        private CircularContainer circle = null!;
+        private Box background = null!;
+
+        public RestoreDefaultValueButton()
+            : base(HoverSampleSet.Button)
+        {
+        }
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colour)
         {
-            BackgroundColour = colour.Lime1;
+            // size intentionally much larger than actual drawn content, so that the button is easier to click.
             Size = new Vector2(3 * size);
 
-            Content.RelativeSizeAxes = Axes.None;
-            Content.Size = new Vector2(size);
-            Content.CornerRadius = size / 2;
+            Add(circle = new CircularContainer
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(size),
+                Masking = true,
+                Child = background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colour.Lime1
+                }
+            });
 
             Alpha = 0f;
 
@@ -77,7 +96,7 @@ namespace osu.Game.Overlays
             FinishTransforms(true);
         }
 
-        public LocalisableString TooltipText => "revert to default";
+        public override LocalisableString TooltipText => "revert to default";
 
         protected override bool OnHover(HoverEvent e)
         {
@@ -104,8 +123,8 @@ namespace osu.Game.Overlays
             if (!Current.Disabled)
             {
                 this.FadeTo(Current.IsDefault ? 0 : 1, fade_duration, Easing.OutQuint);
-                Background.FadeColour(IsHovered ? colours.Lime0 : colours.Lime1, fade_duration, Easing.OutQuint);
-                Content.TweenEdgeEffectTo(new EdgeEffectParameters
+                background.FadeColour(IsHovered ? colours.Lime0 : colours.Lime1, fade_duration, Easing.OutQuint);
+                circle.TweenEdgeEffectTo(new EdgeEffectParameters
                 {
                     Colour = (IsHovered ? colours.Lime1 : colours.Lime3).Opacity(0.4f),
                     Radius = IsHovered ? 8 : 4,
@@ -114,8 +133,8 @@ namespace osu.Game.Overlays
             }
             else
             {
-                Background.FadeColour(colours.Lime3, fade_duration, Easing.OutQuint);
-                Content.TweenEdgeEffectTo(new EdgeEffectParameters
+                background.FadeColour(colours.Lime3, fade_duration, Easing.OutQuint);
+                circle.TweenEdgeEffectTo(new EdgeEffectParameters
                 {
                     Colour = colours.Lime3.Opacity(0.1f),
                     Radius = 2,