From 9c6f77b26eb7242c02fbc62c9b3a930035e2821f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 7 Sep 2023 08:11:04 +0200
Subject: [PATCH] Fix too many things being exposed

---
 .../Mods/OsuModDifficultyAdjust.cs            |  8 ++---
 .../Mods/DifficultyAdjustSettingsControl.cs   | 32 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index 2b11546a4b..933771321c 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
@@ -61,14 +62,13 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private partial class ApproachRateSettingsControl : DifficultyAdjustSettingsControl
         {
-            protected override Drawable CreateControl() => new SliderControl(SliderDisplayCurrent,
+            protected override RoundedSliderBar<float> CreateSlider(BindableNumber<float> current) =>
                 new ApproachRateSlider
                 {
                     RelativeSizeAxes = Axes.X,
-                    Current = SliderDisplayCurrent,
+                    Current = current,
                     KeyboardStep = 0.1f,
-                }
-            );
+                };
 
             /// <summary>
             /// A slider bar with more detailed approach rate info for its given value
diff --git a/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs b/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs
index 1e66b1966f..d04d7636ec 100644
--- a/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs
+++ b/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs
@@ -27,16 +27,16 @@ namespace osu.Game.Rulesets.Mods
         /// When the mod is overriding a default, this will match the value of <see cref="Current"/>.
         /// When there is no override (ie. <see cref="Current"/> is null), this value will match the beatmap provided default via <see cref="updateCurrentFromSlider"/>.
         /// </remarks>
-        protected readonly BindableNumber<float> SliderDisplayCurrent = new BindableNumber<float>();
+        private readonly BindableNumber<float> sliderDisplayCurrent = new BindableNumber<float>();
 
-        protected override Drawable CreateControl() => new SliderControl(SliderDisplayCurrent,
-            new RoundedSliderBar<float>
-            {
-                RelativeSizeAxes = Axes.X,
-                Current = SliderDisplayCurrent,
-                KeyboardStep = 0.1f,
-            }
-        );
+        protected sealed override Drawable CreateControl() => new SliderControl(sliderDisplayCurrent, CreateSlider);
+
+        protected virtual RoundedSliderBar<float> CreateSlider(BindableNumber<float> current) => new RoundedSliderBar<float>
+        {
+            RelativeSizeAxes = Axes.X,
+            Current = current,
+            KeyboardStep = 0.1f,
+        };
 
         /// <summary>
         /// Guards against beatmap values displayed on slider bars being transferred to user override.
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Mods
                 // Intercept and extract the internal number bindable from DifficultyBindable.
                 // This will provide bounds and precision specifications for the slider bar.
                 difficultyBindable = (DifficultyBindable)value.GetBoundCopy();
-                SliderDisplayCurrent.BindTo(difficultyBindable.CurrentNumber);
+                sliderDisplayCurrent.BindTo(difficultyBindable.CurrentNumber);
 
                 base.Current = difficultyBindable;
             }
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Mods
             Current.BindValueChanged(_ => updateCurrentFromSlider());
             beatmap.BindValueChanged(_ => updateCurrentFromSlider(), true);
 
-            SliderDisplayCurrent.BindValueChanged(number =>
+            sliderDisplayCurrent.BindValueChanged(number =>
             {
                 // this handles the transfer of the slider value to the main bindable.
                 // as such, should be skipped if the slider is being updated via updateFromDifficulty().
@@ -80,7 +80,7 @@ namespace osu.Game.Rulesets.Mods
             if (Current.Value != null)
             {
                 // a user override has been added or updated.
-                SliderDisplayCurrent.Value = Current.Value.Value;
+                sliderDisplayCurrent.Value = Current.Value.Value;
                 return;
             }
 
@@ -91,11 +91,11 @@ namespace osu.Game.Rulesets.Mods
                 return;
 
             isInternalChange = true;
-            SliderDisplayCurrent.Value = difficultyBindable.ReadCurrentFromDifficulty(difficulty);
+            sliderDisplayCurrent.Value = difficultyBindable.ReadCurrentFromDifficulty(difficulty);
             isInternalChange = false;
         }
 
-        protected partial class SliderControl : CompositeDrawable, IHasCurrentValue<float?>
+        private partial class SliderControl : CompositeDrawable, IHasCurrentValue<float?>
         {
             // This is required as SettingsItem relies heavily on this bindable for internal use.
             // The actual update flow is done via the bindable provided in the constructor.
@@ -107,11 +107,11 @@ namespace osu.Game.Rulesets.Mods
                 set => current.Current = value;
             }
 
-            public SliderControl(BindableNumber<float> currentNumber, RoundedSliderBar<float> slider)
+            public SliderControl(BindableNumber<float> currentNumber, Func<BindableNumber<float>, RoundedSliderBar<float>> createSlider)
             {
                 InternalChildren = new Drawable[]
                 {
-                    slider
+                    createSlider(currentNumber)
                 };
 
                 AutoSizeAxes = Axes.Y;