diff options
| author | Leo Lam <leolino.lam@gmail.com> | 2017-07-27 15:01:56 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 15:01:56 +0800 |
| commit | 5c29ea54c5413384c4e24bff41d7386f22e7be7e (patch) | |
| tree | 0bac377a436e953eb8e382c9e0b831571daf1d43 /Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp | |
| parent | b140a6eb040109e2bc4e1648b68b5ae6f92ca063 (diff) | |
| parent | de6bd80f9c4deca136b2b6f560e17340605fed9e (diff) | |
Merge pull request #5817 from JosJuice/qt-strings-match-wx
Make DolphinQt2 strings more like DolphinWX strings
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp index 583038e142..024161d4e8 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp @@ -17,7 +17,8 @@ namespace ControllerEmu { -Slider::Slider(const std::string& name_) : ControlGroup(name_, GroupType::Slider) +Slider::Slider(const std::string& name, const std::string& ui_name) + : ControlGroup(name, ui_name, GroupType::Slider) { controls.emplace_back(std::make_unique<Input>("Left")); controls.emplace_back(std::make_unique<Input>("Right")); @@ -25,6 +26,10 @@ Slider::Slider(const std::string& name_) : ControlGroup(name_, GroupType::Slider numeric_settings.emplace_back(std::make_unique<NumericSetting>(_trans("Dead Zone"), 0, 0, 50)); } +Slider::Slider(const std::string& name) : Slider(name, name) +{ +} + void Slider::GetState(ControlState* const slider) { const ControlState deadzone = numeric_settings[0]->GetValue(); |
