From faf8fe132ecc0fc9971406d25a09109088fa4b32 Mon Sep 17 00:00:00 2001
From: HDragonHR <pantheonia1@gmail.com>
Date: Wed, 2 Oct 2019 12:26:46 +0800
Subject: [PATCH] Change bindable int to float

---
 osu.Game/Configuration/OsuConfigManager.cs                  | 2 +-
 osu.Game/Graphics/Containers/HoldToConfirmContainer.cs      | 4 ++--
 .../Settings/Sections/Graphics/UserInterfaceSettings.cs     | 6 +++---
 osu.Game/Screens/Menu/MainMenu.cs                           | 4 ++--
 osu.Game/Screens/Play/HUD/HoldForMenuButton.cs              | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 64b1f2d7bc..c0ce08ba08 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -114,7 +114,7 @@ protected override void InitialiseDefaults()
 
             Set(OsuSetting.UIScale, 1f, 0.8f, 1.6f, 0.01f);
 
-            Set(OsuSetting.UIHoldActivationDelay, 200, 0, 500);
+            Set(OsuSetting.UIHoldActivationDelay, 200f, 0f, 500f, 50f);
 
             Set(OsuSetting.IntroSequence, IntroSequence.Triangles);
         }
diff --git a/osu.Game/Graphics/Containers/HoldToConfirmContainer.cs b/osu.Game/Graphics/Containers/HoldToConfirmContainer.cs
index 5d549ba217..fcf445a878 100644
--- a/osu.Game/Graphics/Containers/HoldToConfirmContainer.cs
+++ b/osu.Game/Graphics/Containers/HoldToConfirmContainer.cs
@@ -30,12 +30,12 @@ public abstract class HoldToConfirmContainer : Container
 
         public Bindable<double> Progress = new BindableDouble();
 
-        private Bindable<int> holdActivationDelay;
+        private Bindable<float> holdActivationDelay;
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            holdActivationDelay = config.GetBindable<int>(OsuSetting.UIHoldActivationDelay);
+            holdActivationDelay = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay);
         }
 
         protected void BeginConfirm()
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs
index a6956b7d9a..a8953ac3a2 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs
@@ -27,16 +27,16 @@ private void load(OsuConfigManager config)
                     LabelText = "Parallax",
                     Bindable = config.GetBindable<bool>(OsuSetting.MenuParallax)
                 },
-                new SettingsSlider<int, TimeSlider>
+                new SettingsSlider<float, TimeSlider>
                 {
                     LabelText = "Hold-to-confirm activation time",
-                    Bindable = config.GetBindable<int>(OsuSetting.UIHoldActivationDelay),
+                    Bindable = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay),
                     KeyboardStep = 50
                 },
             };
         }
 
-        private class TimeSlider : OsuSliderBar<int>
+        private class TimeSlider : OsuSliderBar<float>
         {
             public override string TooltipText => Current.Value.ToString("N0") + "ms";
         }
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 16e9d67cc3..c195ed6cb6 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -62,7 +62,7 @@ public class MainMenu : OsuScreen
 
         protected override BackgroundScreen CreateBackground() => background;
 
-        private Bindable<int> holdDelay;
+        private Bindable<float> holdDelay;
         private Bindable<bool> loginDisplayed;
 
         private ExitConfirmOverlay exitConfirmOverlay;
@@ -70,7 +70,7 @@ public class MainMenu : OsuScreen
         [BackgroundDependencyLoader(true)]
         private void load(DirectOverlay direct, SettingsOverlay settings, OsuConfigManager config, SessionStatics statics)
         {
-            holdDelay = config.GetBindable<int>(OsuSetting.UIHoldActivationDelay);
+            holdDelay = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay);
             loginDisplayed = statics.GetBindable<bool>(Static.LoginOverlayDisplayed);
 
             if (host.CanExit)
diff --git a/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs b/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
index 2dc50326a8..a05937801c 100644
--- a/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
+++ b/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
@@ -63,11 +63,11 @@ public HoldForMenuButton()
         [Resolved]
         private OsuConfigManager config { get; set; }
 
-        private Bindable<int> activationDelay;
+        private Bindable<float> activationDelay;
 
         protected override void LoadComplete()
         {
-            activationDelay = config.GetBindable<int>(OsuSetting.UIHoldActivationDelay);
+            activationDelay = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay);
             activationDelay.BindValueChanged(v =>
             {
                 text.Text = v.NewValue > 0