diff options
| author | JosJuice <josjuice@gmail.com> | 2017-07-23 13:11:06 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2017-07-26 08:04:10 +0200 |
| commit | 960525859bf226445c75b96541e495c14b5e46ba (patch) | |
| tree | 762d8f00b24e91bc77661a956110c08991ea5716 /Source/Core/InputCommon/ControllerEmu/ControlGroup | |
| parent | ce11b34e743cba42886a7d3a9d5c8123580808e5 (diff) | |
Make DolphinWX strings more like DolphinQt2 strings
Same as the previous commit, except I'm copying strings
in the other direction because the DolphinWX variants
of these strings could use some improvement.
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp | 7 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h | 1 |
2 files changed, 7 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(); diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h index ea2cabc988..0d77b1662a 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h @@ -13,6 +13,7 @@ namespace ControllerEmu class Slider : public ControlGroup { public: + Slider(const std::string& name, const std::string& ui_name); explicit Slider(const std::string& name); void GetState(ControlState* slider); |
