diff options
| author | Mat M <mathew1800@gmail.com> | 2016-11-29 07:39:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-29 07:39:28 -0500 |
| commit | eebe4ef1fd569bbcb8c87d961de866d687c58354 (patch) | |
| tree | 1150a54cc20150e49cec80ca21ee548d4c66cc67 /Source/Core/InputCommon/ControllerEmu.cpp | |
| parent | 0212741574548fa95593e0e9d9451feca45ab83d (diff) | |
| parent | 32a0dae257c0454e38014b97709580175b8895a5 (diff) | |
Merge pull request #4461 from aldelaro5/hotkey-config-redo
Redo every input configuration dialog
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu.cpp index 84f511f822..4a7600dca7 100644 --- a/Source/Core/InputCommon/ControllerEmu.cpp +++ b/Source/Core/InputCommon/ControllerEmu.cpp @@ -187,7 +187,14 @@ ControllerEmu::AnalogStick::AnalogStick(const char* const _name, const char* con numeric_settings.emplace_back(std::make_unique<NumericSetting>(_trans("Dead Zone"), 0, 0, 50)); } -ControllerEmu::Buttons::Buttons(const std::string& _name) : ControlGroup(_name, GROUP_TYPE_BUTTONS) +ControllerEmu::Buttons::Buttons(const std::string& _name) + : ControlGroup(_name, _name, GROUP_TYPE_BUTTONS) +{ + numeric_settings.emplace_back(std::make_unique<NumericSetting>(_trans("Threshold"), 0.5)); +} + +ControllerEmu::Buttons::Buttons(const std::string& ini_name, const std::string& group_name) + : ControlGroup(ini_name, group_name, GROUP_TYPE_BUTTONS) { numeric_settings.emplace_back(std::make_unique<NumericSetting>(_trans("Threshold"), 0.5)); } |
