Merge pull request #6732 from spycrab/qt_profile_fixes

Qt: Mapping fixes
dolphin-emu · May 2, 2018 · a6b35ed · a6b35ed
2 parents 71c8c65 + e3cebeb
commit a6b35ed
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
@@ -130,6 +130,7 @@ void MappingButton::OnButtonTimeout()
 void MappingButton::Clear()
 {
   m_reference->SetExpression("");
+  m_reference->range = 100;
   m_parent->SaveSettings();
   Update();
 }

diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp
@@ -24,6 +24,7 @@ MappingWidget::MappingWidget(MappingWindow* window) : m_parent(window)
 {
   connect(window, &MappingWindow::ClearFields, this, &MappingWidget::OnClearFields);
   connect(window, &MappingWindow::Update, this, &MappingWidget::Update);
+  connect(window, &MappingWindow::Save, this, &MappingWidget::SaveSettings);
 }
 
 MappingWindow* MappingWidget::GetParent() const

diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.h b/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.h
@@ -24,15 +24,15 @@ namespace ControllerEmu
 class Control;
 class ControlGroup;
 class EmulatedController;
-}
+}  // namespace ControllerEmu
 
 namespace ciface
 {
 namespace Core
 {
 class Device;
 }
-}
+}  // namespace ciface
 
 class MappingWidget : public QWidget
 {

diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
@@ -345,6 +345,7 @@ void MappingWindow::OnDefaultFieldsPressed()
   m_controller->LoadDefaults(g_controller_interface);
   m_controller->UpdateReferences(g_controller_interface);
   emit Update();
+  emit Save();
 }
 
 bool MappingWindow::IsIterativeInput() const

diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.h b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.h
@@ -56,6 +56,7 @@ class MappingWindow final : public QDialog
 signals:
   void Update();
   void ClearFields();
+  void Save();
 
 private:
   void SetMappingType(Type type);