piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

NumericSetting: Stop values from binding to numbered input names.

Browse Source
This commit is contained in:
Jordan Woyak
2024-03-20 22:40:01 -05:00
parent 5039072ae9
commit e9fe0d3d5b
3 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Source/Core/InputCommon/ControllerEmu/Setting/NumericSetting.cpp
View File

@ -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()
template <typename T>
void NumericSetting<T>::SetExpressionFromValue()
{
m_value.m_input.SetExpression(ValueToString(GetValue()));
// 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<double>::SetExpressionFromValue()
template <typename T>
void NumericSetting<T>::SimplifyIfPossible()
{
// 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());
}
template <>
void NumericSetting<bool>::SetExpressionFromValue()
{
// 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 <>