diff options
| author |  Ameer J | 2023-11-26 21:08:53 -0500 |
|---|---|---|
| committer |  GitHub | 2023-11-26 21:08:53 -0500 |
| commit | 1d11fe00a3000efbf6a0a4bb690e0d544a1b7b4a (patch) | |
| tree | c219aacab776c0a1e3956614b60a01fa2f6164cb /src/input_common/drivers/joycon.cpp | |
| parent | shader_recompiler: Align SSBO offsets in GlobalMemory functions (diff) | |
| parent | Merge pull request #11535 from GPUCode/upload_cmdbuf (diff) | |
| download | yuzu-1d11fe00a3000efbf6a0a4bb690e0d544a1b7b4a.tar.gz yuzu-1d11fe00a3000efbf6a0a4bb690e0d544a1b7b4a.tar.xz yuzu-1d11fe00a3000efbf6a0a4bb690e0d544a1b7b4a.zip | |
Merge branch 'master' into ssbo-align
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; |