summaryrefslogtreecommitdiffstats
path: root/src/input_common/drivers/joycon.cpp
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-11-16 15:13:39 +0100
committerGitHub <noreply@github.com>2023-11-16 15:13:39 +0100
commitea4c92f734fdcb26d20d1313a84d39cc95c9c575 (patch)
treec2bec0a6007751afd01fe624a003026ab9831bd1 /src/input_common/drivers/joycon.cpp
parentMerge pull request #12043 from t895/disable-pip-default (diff)
parentcore: hid: Split SL and SR buttons (diff)
downloadyuzu-ea4c92f734fdcb26d20d1313a84d39cc95c9c575.tar
yuzu-ea4c92f734fdcb26d20d1313a84d39cc95c9c575.tar.gz
yuzu-ea4c92f734fdcb26d20d1313a84d39cc95c9c575.tar.bz2
yuzu-ea4c92f734fdcb26d20d1313a84d39cc95c9c575.tar.lz
yuzu-ea4c92f734fdcb26d20d1313a84d39cc95c9c575.tar.xz
yuzu-ea4c92f734fdcb26d20d1313a84d39cc95c9c575.tar.zst
yuzu-ea4c92f734fdcb26d20d1313a84d39cc95c9c575.zip
Diffstat (limited to 'src/input_common/drivers/joycon.cpp')
-rw-r--r--src/input_common/drivers/joycon.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/input_common/drivers/joycon.cpp b/src/input_common/drivers/joycon.cpp
index 0aca5a3a3..72d2951f3 100644
--- a/src/input_common/drivers/joycon.cpp
+++ b/src/input_common/drivers/joycon.cpp
@@ -680,8 +680,8 @@ ButtonMapping Joycons::GetButtonMappingForDevice(const Common::ParamPackage& par
Common::ParamPackage sr_button_params = button_params;
sl_button_params.Set("button", static_cast<int>(Joycon::PadButton::LeftSL));
sr_button_params.Set("button", static_cast<int>(Joycon::PadButton::LeftSR));
- mapping.insert_or_assign(Settings::NativeButton::SL, std::move(sl_button_params));
- mapping.insert_or_assign(Settings::NativeButton::SR, std::move(sr_button_params));
+ mapping.insert_or_assign(Settings::NativeButton::SLLeft, std::move(sl_button_params));
+ mapping.insert_or_assign(Settings::NativeButton::SRLeft, std::move(sr_button_params));
}
// Map SL and SR buttons for right joycons
@@ -693,8 +693,8 @@ ButtonMapping Joycons::GetButtonMappingForDevice(const Common::ParamPackage& par
Common::ParamPackage sr_button_params = button_params;
sl_button_params.Set("button", static_cast<int>(Joycon::PadButton::RightSL));
sr_button_params.Set("button", static_cast<int>(Joycon::PadButton::RightSR));
- mapping.insert_or_assign(Settings::NativeButton::SL, std::move(sl_button_params));
- mapping.insert_or_assign(Settings::NativeButton::SR, std::move(sr_button_params));
+ mapping.insert_or_assign(Settings::NativeButton::SLRight, std::move(sl_button_params));
+ mapping.insert_or_assign(Settings::NativeButton::SRRight, std::move(sr_button_params));
}
return mapping;