Switch joystick axis tolerance type to float

1 files changed, 8 insertions, 6 deletions

diff --git a/src/gui/widgets/tabs/setup_joystick.cpp b/src/gui/widgets/tabs/setup_joystick.cpp
index 3542f39a5..c7ece8c7a 100644
--- a/src/gui/widgets/tabs/setup_joystick.cpp
+++ b/src/gui/widgets/tabs/setup_joystick.cpp
@@ -54,7 +54,7 @@ Setup_Joystick::Setup_Joystick(const Widget2 *const widget) :
     mNamesDropDown(new DropDown(this, mNamesModel,
         false, Modal_false, nullptr, std::string())),
     mToleranceLabel(new Label(this)),
-    mToleranceSlider(new Slider(this, 1000, 32767, 1000)),
+    mToleranceSlider(new Slider(this, 0.01, 1, 0.01)),
     mUseInactiveCheckBox(new CheckBox(this,
         // TRANSLATORS: joystick settings tab checkbox
         _("Use joystick if client window inactive"),
@@ -71,10 +71,11 @@ Setup_Joystick::Setup_Joystick(const Widget2 *const widget) :
     mJoystickEnabled->setActionEventId("joystick");
     mJoystickEnabled->addActionListener(this);
 
-    int tolerance = config.getIntValue("joystickTolerance");
+    float tolerance = config.getFloatValue("joystickTolerance");
     mToleranceSlider->setValue(tolerance);
     // TRANSLATORS: joystick settings tab label
-    mToleranceLabel->setCaption(_("Axis tolerance: ") + strprintf("%d", tolerance));
+    mToleranceLabel->setCaption(_("Axis tolerance: ")
+        + strprintf("%.2f", tolerance));
     mToleranceLabel->setWidth(150);
     mToleranceLabel->setHeight(20);
 
@@ -130,9 +131,10 @@ void Setup_Joystick::action(const ActionEvent &event)
     }
     else if (source == mToleranceSlider)
     {
-        int tolerance = mToleranceSlider->getValue();
+        float tolerance = mToleranceSlider->getValue();
         // TRANSLATORS: joystick settings tab label
-        mToleranceLabel->setCaption(_("Axis tolerance: ") + strprintf("%d", tolerance));
+        mToleranceLabel->setCaption(_("Axis tolerance: ")
+            + strprintf("%.2f", tolerance));
     }
     else if (source == mDetectButton)
     {
@@ -177,7 +179,7 @@ void Setup_Joystick::apply()
     config.setValue("useInactiveJoystick", mUseInactiveCheckBox->isSelected());
     joystick->setUseInactive(mUseInactiveCheckBox->isSelected());
 
-    int tolerance = mToleranceSlider->getValue();
+    float tolerance = mToleranceSlider->getValue();
     config.setValue("joystickTolerance", tolerance);
     joystick->setTolerance(tolerance);
 }