From 638c8f1adc2e135aff574e135c515adfbf384423 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 00:25:23 +0900
Subject: [PATCH] Get rid of weird cruft and non-standard flow

---
 .../Edit/FreehandSliderSettingsProvider.cs    | 66 ++++++++++---------
 .../Edit/OsuHitObjectComposer.cs              |  5 +-
 2 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/FreehandSliderSettingsProvider.cs b/osu.Game.Rulesets.Osu/Edit/FreehandSliderSettingsProvider.cs
index 9ad2b5d0f5..f4ee130938 100644
--- a/osu.Game.Rulesets.Osu/Edit/FreehandSliderSettingsProvider.cs
+++ b/osu.Game.Rulesets.Osu/Edit/FreehandSliderSettingsProvider.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
@@ -10,8 +11,13 @@ using osu.Game.Rulesets.Edit;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
-    public partial class FreehandSliderSettingsProvider : Drawable
+    public partial class FreehandSliderSettingsProvider : EditorToolboxGroup
     {
+        public FreehandSliderSettingsProvider()
+            : base("slider")
+        {
+        }
+
         public BindableFloat Tolerance { get; } = new BindableFloat(1.5f)
         {
             MinValue = 0.05f,
@@ -41,6 +47,34 @@ namespace osu.Game.Rulesets.Osu.Edit
         private ExpandableSlider<int> toleranceSlider = null!;
         private ExpandableSlider<int> cornerThresholdSlider = null!;
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Children = new Drawable[]
+            {
+                toleranceSlider = new ExpandableSlider<int>
+                {
+                    Current = sliderTolerance
+                },
+                cornerThresholdSlider = new ExpandableSlider<int>
+                {
+                    Current = sliderCornerThreshold
+                }
+            };
+
+            sliderTolerance.BindValueChanged(e =>
+            {
+                toleranceSlider.ContractedLabelText = $"C. P. S.: {e.NewValue:N0}";
+                toleranceSlider.ExpandedLabelText = $"Control Point Spacing: {e.NewValue:N0}";
+            }, true);
+
+            sliderCornerThreshold.BindValueChanged(e =>
+            {
+                cornerThresholdSlider.ContractedLabelText = $"C. T.: {e.NewValue:N0}";
+                cornerThresholdSlider.ExpandedLabelText = $"Corner Threshold: {e.NewValue:N0}";
+            }, true);
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -70,35 +104,5 @@ namespace osu.Game.Rulesets.Osu.Edit
                     sliderCornerThreshold.Value = newValue;
             });
         }
-
-        public void AttachToToolbox(ExpandingToolboxContainer toolboxContainer)
-        {
-            toolboxContainer.Add(new EditorToolboxGroup("slider")
-            {
-                Children = new Drawable[]
-                {
-                    toleranceSlider = new ExpandableSlider<int>
-                    {
-                        Current = sliderTolerance
-                    },
-                    cornerThresholdSlider = new ExpandableSlider<int>
-                    {
-                        Current = sliderCornerThreshold
-                    }
-                }
-            });
-
-            sliderTolerance.BindValueChanged(e =>
-            {
-                toleranceSlider.ContractedLabelText = $"C. P. S.: {e.NewValue:N0}";
-                toleranceSlider.ExpandedLabelText = $"Control Point Spacing: {e.NewValue:N0}";
-            }, true);
-
-            sliderCornerThreshold.BindValueChanged(e =>
-            {
-                cornerThresholdSlider.ContractedLabelText = $"C. T.: {e.NewValue:N0}";
-                cornerThresholdSlider.ExpandedLabelText = $"Corner Threshold: {e.NewValue:N0}";
-            }, true);
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 7bf1a12149..06584ef17a 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         protected readonly OsuDistanceSnapProvider DistanceSnapProvider = new OsuDistanceSnapProvider();
 
         [Cached]
-        protected readonly FreehandSliderSettingsProvider FreehandSliderSettingsProvider = new FreehandSliderSettingsProvider();
+        protected readonly FreehandSliderSettingsProvider FreehandlSliderToolboxGroup = new FreehandSliderSettingsProvider();
 
         [BackgroundDependencyLoader]
         private void load()
@@ -102,8 +102,7 @@ namespace osu.Game.Rulesets.Osu.Edit
                 RotationHandler = BlueprintContainer.SelectionHandler.RotationHandler,
             });
 
-            AddInternal(FreehandSliderSettingsProvider);
-            FreehandSliderSettingsProvider.AttachToToolbox(RightToolbox);
+            RightToolbox.Add(FreehandlSliderToolboxGroup);
         }
 
         protected override ComposeBlueprintContainer CreateBlueprintContainer()