DolphinQt/Mapping: Disable relative input when "Mouse Controlled Pointing" button is pressed.

3 files changed, 8 insertions, 1 deletions

diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp
index 98784c00ae..0ba4bfa3ea 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp
@@ -181,6 +181,11 @@ ControlState Cursor::GetVerticalOffset() const
   return m_vertical_offset_setting.GetValue() / 100;
 }
 
+void Cursor::SetRelativeInput(bool value)
+{
+  m_relative_setting.SetValue(value);
+}
+
 bool Cursor::StateData::IsVisible() const
 {
   return !std::isnan(x);
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h
index 3710a40d92..7b2e5f581c 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h
@@ -40,6 +40,8 @@ public:
   // Vertical offset in meters.
   ControlState GetVerticalOffset() const;
 
+  void SetRelativeInput(bool enabled);
+
 private:
   Cursor::StateData UpdateState(Cursor::ReshapeData input);
 
diff --git a/Source/Core/InputCommon/ControllerEmu/Setting/NumericSetting.h b/Source/Core/InputCommon/ControllerEmu/Setting/NumericSetting.h
index b102b062e7..863e211cae 100644
--- a/Source/Core/InputCommon/ControllerEmu/Setting/NumericSetting.h
+++ b/Source/Core/InputCommon/ControllerEmu/Setting/NumericSetting.h
@@ -186,7 +186,6 @@ public:
 
   bool IsSimpleValue() const { return m_input.GetExpression().empty(); }
 
-private:
   void SetValue(ValueType value)
   {
     m_value = value;
@@ -195,6 +194,7 @@ private:
     m_input.SetExpression("");
   }
 
+private:
   // Values are R/W by both UI and CPU threads.
   mutable std::atomic<ValueType> m_value = {};