github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-08 04:25:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

InputManager: Fix per-bind sensitivity/deadzone not copying to profile

Browse Source
This commit is contained in:
Stenzek 2025-01-10 20:14:21 +10:00
parent ccfc60ec94
commit 7ac4a85765
No known key found for this signature in database
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/util/input_manager.cpp
View File

@ -910,11 +910,11 @@ void InputManager::AddPadBindings(const SettingsInterface& si, const std::string
for (u32 macro_button_index = 0; macro_button_index < NUM_MACRO_BUTTONS_PER_CONTROLLER; macro_button_index++) for (u32 macro_button_index = 0; macro_button_index < NUM_MACRO_BUTTONS_PER_CONTROLLER; macro_button_index++)
{ {
const std::vector<std::string> bindings( const std::vector<std::string> bindings(
si.GetStringList(section.c_str(), fmt::format("Macro{}", macro_button_index + 1u).c_str())); si.GetStringList(section.c_str(), TinyString::from_format("Macro{}", macro_button_index + 1u).c_str()));
if (!bindings.empty()) if (!bindings.empty())
{ {
const float deadzone = const float deadzone = si.GetFloatValue(
si.GetFloatValue(section.c_str(), fmt::format("Macro{}Deadzone", macro_button_index + 1).c_str(), 0.0f); section.c_str(), TinyString::from_format("Macro{}Deadzone", macro_button_index + 1).c_str(), 0.0f);
for (const std::string& binding : bindings) for (const std::string& binding : bindings)
{ {
// We currently can't use chords with a deadzone. // We currently can't use chords with a deadzone.
@ -1479,12 +1479,17 @@ void InputManager::CopyConfiguration(SettingsInterface* dest_si, const SettingsI
if (copy_pad_bindings) if (copy_pad_bindings)
{ {
for (const Controller::ControllerBindingInfo& bi : info->bindings) for (const Controller::ControllerBindingInfo& bi : info->bindings)
{
dest_si->CopyStringListValue(src_si, section.c_str(), bi.name); dest_si->CopyStringListValue(src_si, section.c_str(), bi.name);
dest_si->CopyFloatValue(src_si, section.c_str(), TinyString::from_format("{}Scale", bi.name));
dest_si->CopyFloatValue(src_si, section.c_str(), TinyString::from_format("{}Deadzone", bi.name));
}
for (u32 i = 0; i < NUM_MACRO_BUTTONS_PER_CONTROLLER; i++) for (u32 i = 0; i < NUM_MACRO_BUTTONS_PER_CONTROLLER; i++)
{ {
dest_si->CopyStringListValue(src_si, section.c_str(), TinyString::from_format("Macro{}", i + 1)); dest_si->CopyStringListValue(src_si, section.c_str(), TinyString::from_format("Macro{}", i + 1));
dest_si->CopyStringValue(src_si, section.c_str(), TinyString::from_format("Macro{}Binds", i + 1)); dest_si->CopyStringValue(src_si, section.c_str(), TinyString::from_format("Macro{}Binds", i + 1));
dest_si->CopyFloatValue(src_si, section.c_str(), TinyString::from_format("Macro{}Deadzone", i + 1));
dest_si->CopyFloatValue(src_si, section.c_str(), TinyString::from_format("Macro{}Pressure", i + 1)); dest_si->CopyFloatValue(src_si, section.c_str(), TinyString::from_format("Macro{}Pressure", i + 1));
dest_si->CopyUIntValue(src_si, section.c_str(), TinyString::from_format("Macro{}Frequency", i + 1)); dest_si->CopyUIntValue(src_si, section.c_str(), TinyString::from_format("Macro{}Frequency", i + 1));
dest_si->CopyBoolValue(src_si, section.c_str(), TinyString::from_format("Macro{}Toggle", i + 1)); dest_si->CopyBoolValue(src_si, section.c_str(), TinyString::from_format("Macro{}Toggle", i + 1));