diff options
| author | 2023-11-16 09:13:39 -0500 | |
|---|---|---|
| committer | 2023-11-16 09:13:39 -0500 | |
| commit | ea4c92f734fdcb26d20d1313a84d39cc95c9c575 (patch) | |
| tree | c2bec0a6007751afd01fe624a003026ab9831bd1 /src/input_common/drivers/joycon.cpp | |
| parent | Merge pull request #12043 from t895/disable-pip-default (diff) | |
| parent | core: hid: Split SL and SR buttons (diff) | |
| download | yuzu-ea4c92f734fdcb26d20d1313a84d39cc95c9c575.tar.gz yuzu-ea4c92f734fdcb26d20d1313a84d39cc95c9c575.tar.xz yuzu-ea4c92f734fdcb26d20d1313a84d39cc95c9c575.zip | |
Merge pull request #12007 from german77/moar_buttons
core: hid: Split SL and SR buttons
Diffstat (limited to 'src/input_common/drivers/joycon.cpp')
| -rw-r--r-- | src/input_common/drivers/joycon.cpp | 8 |
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 | |||
| 680 | Common::ParamPackage sr_button_params = button_params; | 680 | Common::ParamPackage sr_button_params = button_params; |
| 681 | sl_button_params.Set("button", static_cast<int>(Joycon::PadButton::LeftSL)); | 681 | sl_button_params.Set("button", static_cast<int>(Joycon::PadButton::LeftSL)); |
| 682 | sr_button_params.Set("button", static_cast<int>(Joycon::PadButton::LeftSR)); | 682 | sr_button_params.Set("button", static_cast<int>(Joycon::PadButton::LeftSR)); |
| 683 | mapping.insert_or_assign(Settings::NativeButton::SL, std::move(sl_button_params)); | 683 | mapping.insert_or_assign(Settings::NativeButton::SLLeft, std::move(sl_button_params)); |
| 684 | mapping.insert_or_assign(Settings::NativeButton::SR, std::move(sr_button_params)); | 684 | mapping.insert_or_assign(Settings::NativeButton::SRLeft, std::move(sr_button_params)); |
| 685 | } | 685 | } |
| 686 | 686 | ||
| 687 | // Map SL and SR buttons for right joycons | 687 | // Map SL and SR buttons for right joycons |
| @@ -693,8 +693,8 @@ ButtonMapping Joycons::GetButtonMappingForDevice(const Common::ParamPackage& par | |||
| 693 | Common::ParamPackage sr_button_params = button_params; | 693 | Common::ParamPackage sr_button_params = button_params; |
| 694 | sl_button_params.Set("button", static_cast<int>(Joycon::PadButton::RightSL)); | 694 | sl_button_params.Set("button", static_cast<int>(Joycon::PadButton::RightSL)); |
| 695 | sr_button_params.Set("button", static_cast<int>(Joycon::PadButton::RightSR)); | 695 | sr_button_params.Set("button", static_cast<int>(Joycon::PadButton::RightSR)); |
| 696 | mapping.insert_or_assign(Settings::NativeButton::SL, std::move(sl_button_params)); | 696 | mapping.insert_or_assign(Settings::NativeButton::SLRight, std::move(sl_button_params)); |
| 697 | mapping.insert_or_assign(Settings::NativeButton::SR, std::move(sr_button_params)); | 697 | mapping.insert_or_assign(Settings::NativeButton::SRRight, std::move(sr_button_params)); |
| 698 | } | 698 | } |
| 699 | 699 | ||
| 700 | return mapping; | 700 | return mapping; |