From 9cb17b062c763e3e00425c9d324874509bbaf8c6 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 14 Mar 2019 20:27:49 -0500 Subject: DolphinQ: Mapping UI cleanups. --- .../DolphinQt/Config/Mapping/MappingNumeric.cpp | 24 ++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp') diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp index e5fb3a4548..0de807d68c 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp @@ -10,25 +10,23 @@ #include "InputCommon/ControllerEmu/Setting/NumericSetting.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" -MappingNumeric::MappingNumeric(MappingWidget* widget, ControllerEmu::NumericSetting* setting) - : m_parent(widget), m_setting(setting) +MappingNumeric::MappingNumeric(MappingWidget* parent, ControllerEmu::NumericSetting* setting) + : m_setting(*setting) { setRange(setting->m_low, setting->m_high); - Update(); - Connect(); -} -void MappingNumeric::Connect() -{ connect(this, static_cast(&QSpinBox::valueChanged), this, - [this](int value) { - m_setting->SetValue(static_cast(value) / 100); - m_parent->SaveSettings(); - m_parent->GetController()->UpdateReferences(g_controller_interface); + [this, parent](int value) { + m_setting.SetValue(static_cast(value) / 100); + parent->SaveSettings(); }); + + connect(parent, &MappingWidget::ConfigChanged, this, &MappingNumeric::ConfigChanged); } -void MappingNumeric::Update() +void MappingNumeric::ConfigChanged() { - setValue(m_setting->GetValue() * 100); + const bool old_state = blockSignals(true); + setValue(m_setting.GetValue() * 100); + blockSignals(old_state); } -- cgit v1.2.3