From e9fe0d3d5b81bcaffbbc00c132705adc03142c61 Mon Sep 17 00:00:00 2001
From: Jordan Woyak <jordan.woyak@gmail.com>
Date: Wed, 20 Mar 2024 22:40:01 -0500
Subject: NumericSetting: Stop values from binding to numbered input names.

---
 .../ControllerEmu/Setting/NumericSetting.cpp       | 35 ++++++++++------------
 1 file changed, 16 insertions(+), 19 deletions(-)

(limited to 'Source/Core/InputCommon/ControllerEmu/Setting/NumericSetting.cpp')

diff --git a/Source/Core/InputCommon/ControllerEmu/Setting/NumericSetting.cpp b/Source/Core/InputCommon/ControllerEmu/Setting/NumericSetting.cpp
index ec28a4d6f6..f551e39b44 100644
--- a/Source/Core/InputCommon/ControllerEmu/Setting/NumericSetting.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/Setting/NumericSetting.cpp
@@ -3,7 +3,7 @@
 
 #include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
 
-#include <sstream>
+#include <fmt/format.h>
 
 namespace ControllerEmu
 {
@@ -11,6 +11,11 @@ NumericSettingBase::NumericSettingBase(const NumericSettingDetails& details) : m
 {
 }
 
+// Explicit instantiations so generic definitions can exist outside of the header.
+template class NumericSetting<int>;
+template class NumericSetting<double>;
+template class NumericSetting<bool>;
+
 const char* NumericSettingBase::GetININame() const
 {
   return m_details.ini_name;
@@ -36,28 +41,20 @@ SettingVisibility NumericSettingBase::GetVisibility() const
   return m_details.visibility;
 }
 
-template <>
-void NumericSetting<int>::SetExpressionFromValue()
-{
-  m_value.m_input.SetExpression(ValueToString(GetValue()));
-}
-
-template <>
-void NumericSetting<double>::SetExpressionFromValue()
+template <typename T>
+void NumericSetting<T>::SetExpressionFromValue()
 {
-  // We must use a dot decimal separator for expression parser.
-  std::ostringstream ss;
-  ss.imbue(std::locale::classic());
-  ss << GetValue();
-
-  m_value.m_input.SetExpression(ss.str());
+  // Always include -/+ sign to prevent CoalesceExpression binding.
+  // e.g. 1 is a valid input name for keyboard devices, +1 is not.
+  m_value.m_input.SetExpression(fmt::format("{:+g}", ControlState(GetValue())));
 }
 
-template <>
-void NumericSetting<bool>::SetExpressionFromValue()
+template <typename T>
+void NumericSetting<T>::SimplifyIfPossible()
 {
-  // Cast bool to prevent "true"/"false" strings.
-  m_value.m_input.SetExpression(ValueToString(int(GetValue())));
+  ValueType value;
+  if (TryParse(std::string(StripWhitespace(m_value.m_input.GetExpression())), &value))
+    m_value.SetValue(value);
 }
 
 template <>
-- 
cgit v1.2.3