From e81d3c51edb0f4ca502409593d03d34c0b523a1a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Jan 2020 15:00:45 +0900
Subject: [PATCH] Move select tool to an actual tool implementation

Also tidies up radio button action firing so calling Select actually fires the associated action in all cases.
---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   | 14 ++++----
 .../Edit/Tools/HitObjectCompositionTool.cs    |  2 ++
 osu.Game/Rulesets/Edit/Tools/SelectTool.cs    | 15 +++++++++
 .../RadioButtons/DrawableRadioButton.cs       | 18 ++---------
 .../Components/RadioButtons/RadioButton.cs    | 32 +++++++++++--------
 5 files changed, 44 insertions(+), 37 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/Tools/SelectTool.cs

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 9ee3bacf9b..c413d25f09 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -137,12 +137,12 @@ namespace osu.Game.Rulesets.Edit
                 }
             };
 
-            toolboxCollection.Items =
-                CompositionTools.Select(t => new RadioButton(t.Name, () => selectTool(t)))
-                                .Prepend(new RadioButton("Select", () => selectTool(null)))
-                                .ToList();
+            toolboxCollection.Items = CompositionTools
+                                      .Prepend(new SelectTool())
+                                      .Select(t => new RadioButton(t.Name, () => toolSelected(t)))
+                                      .ToList();
 
-            toolboxCollection.Items[0].Select();
+            toolboxCollection.Items.First().Select();
 
             blueprintContainer.SelectionChanged += selectionChanged;
         }
@@ -187,11 +187,11 @@ namespace osu.Game.Rulesets.Edit
                 showGridFor(hitObjects);
         }
 
-        private void selectTool(HitObjectCompositionTool tool)
+        private void toolSelected(HitObjectCompositionTool tool)
         {
             blueprintContainer.CurrentTool = tool;
 
-            if (tool == null)
+            if (tool is SelectTool)
                 distanceSnapGridContainer.Hide();
             else
                 showGridFor(Enumerable.Empty<HitObject>());
diff --git a/osu.Game/Rulesets/Edit/Tools/HitObjectCompositionTool.cs b/osu.Game/Rulesets/Edit/Tools/HitObjectCompositionTool.cs
index 825c63e6ee..0631031302 100644
--- a/osu.Game/Rulesets/Edit/Tools/HitObjectCompositionTool.cs
+++ b/osu.Game/Rulesets/Edit/Tools/HitObjectCompositionTool.cs
@@ -13,5 +13,7 @@ namespace osu.Game.Rulesets.Edit.Tools
         }
 
         public abstract PlacementBlueprint CreatePlacementBlueprint();
+
+        public override string ToString() => Name;
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Tools/SelectTool.cs b/osu.Game/Rulesets/Edit/Tools/SelectTool.cs
new file mode 100644
index 0000000000..b96eeb0790
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Tools/SelectTool.cs
@@ -0,0 +1,15 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Rulesets.Edit.Tools
+{
+    public class SelectTool : HitObjectCompositionTool
+    {
+        public SelectTool()
+            : base("Select")
+        {
+        }
+
+        public override PlacementBlueprint CreatePlacementBlueprint() => null;
+    }
+}
diff --git a/osu.Game/Screens/Edit/Components/RadioButtons/DrawableRadioButton.cs b/osu.Game/Screens/Edit/Components/RadioButtons/DrawableRadioButton.cs
index 5854d66aa8..7be91f4e8e 100644
--- a/osu.Game/Screens/Edit/Components/RadioButtons/DrawableRadioButton.cs
+++ b/osu.Game/Screens/Edit/Components/RadioButtons/DrawableRadioButton.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -37,8 +36,8 @@ namespace osu.Game.Screens.Edit.Components.RadioButtons
         {
             this.button = button;
 
-            Text = button.Text;
-            Action = button.Action;
+            Text = button.Item.ToString();
+            Action = button.Select;
 
             RelativeSizeAxes = Axes.X;
 
@@ -100,19 +99,6 @@ namespace osu.Game.Screens.Edit.Components.RadioButtons
             bubble.Colour = button.Selected.Value ? selectedBubbleColour : defaultBubbleColour;
         }
 
-        protected override bool OnClick(ClickEvent e)
-        {
-            if (button.Selected.Value)
-                return true;
-
-            if (!Enabled.Value)
-                return true;
-
-            button.Selected.Value = true;
-
-            return base.OnClick(e);
-        }
-
         protected override SpriteText CreateText() => new OsuSpriteText
         {
             Depth = -1,
diff --git a/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs b/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs
index 3692c0437b..b515d7c8bd 100644
--- a/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs
+++ b/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs
@@ -15,33 +15,37 @@ namespace osu.Game.Screens.Edit.Components.RadioButtons
         public readonly BindableBool Selected;
 
         /// <summary>
-        /// The text that should be displayed in this button.
+        /// The item related to this button.
         /// </summary>
-        public string Text;
+        public object Item;
 
-        /// <summary>
-        /// The <see cref="Action"/> that should be invoked when this button is selected.
-        /// </summary>
-        public Action Action;
+        private readonly Action action;
 
-        public RadioButton(string text, Action action)
+        public RadioButton(object item, Action action)
         {
-            Text = text;
-            Action = action;
+            Item = item;
+            this.action = action;
             Selected = new BindableBool();
         }
 
-        public RadioButton(string text)
-            : this(text, null)
+        public RadioButton(string item)
+            : this(item, null)
         {
-            Text = text;
-            Action = null;
+            Item = item;
+            action = null;
         }
 
         /// <summary>
         /// Selects this <see cref="RadioButton"/>.
         /// </summary>
-        public void Select() => Selected.Value = true;
+        public void Select()
+        {
+            if (!Selected.Value)
+            {
+                Selected.Value = true;
+                action?.Invoke();
+            }
+        }
 
         /// <summary>
         /// Deselects this <see cref="RadioButton"/>.