From 5efb717873691fa42447ca0d9d9810b5ad501b42 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 26 Mar 2019 19:31:03 -0500 Subject: InputCommon: Clean up how numeric settings are handled. Add units of measure to UI. Eliminate hidden magic values of the IR cursor. --- Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp') diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp index f7e20dc386..f734b46181 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp @@ -13,7 +13,6 @@ #include "InputCommon/ControllerEmu/Control/Control.h" #include "InputCommon/ControllerEmu/Control/Input.h" #include "InputCommon/ControllerEmu/ControllerEmu.h" -#include "InputCommon/ControllerEmu/Setting/NumericSetting.h" namespace ControllerEmu { @@ -23,7 +22,7 @@ Slider::Slider(const std::string& name_, const std::string& ui_name_) controls.emplace_back(std::make_unique(Translate, _trans("Left"))); controls.emplace_back(std::make_unique(Translate, _trans("Right"))); - numeric_settings.emplace_back(std::make_unique(_trans("Dead Zone"), 0, 0, 50)); + AddDeadzoneSetting(&m_deadzone_setting, 50); } Slider::Slider(const std::string& name_) : Slider(name_, name_) @@ -32,7 +31,7 @@ Slider::Slider(const std::string& name_) : Slider(name_, name_) Slider::StateData Slider::GetState() { - const ControlState deadzone = numeric_settings[0]->GetValue(); + const ControlState deadzone = m_deadzone_setting.GetValue() / 100; const ControlState state = controls[1]->control_ref->State() - controls[0]->control_ref->State(); if (fabs(state) > deadzone) -- cgit v1.2.3