From dfb6164ba5385b43e45b0a0d8f894a84ef60a90c Mon Sep 17 00:00:00 2001 From: Mcost45 Date: Mon, 22 Sep 2025 14:23:40 -0500 Subject: [PATCH] Include SL/SR default bindings for single joycons Single L/R Joycons default to unbound for the SL/SR inputs - so by default you can't progress past 'press L + R to continue' type screens. But * ConfigGamepadInputId.SingleLeftTrigger0(L) * ConfigGamepadInputId.SingleRightTrigger0(L) * ConfigGamepadInputId.SingleLeftTrigger1(R) * ConfigGamepadInputId.SingleRightTrigger1(R) already exist (and I verified these are the inputs triggered by the SL/SR buttons), so my change would default to these instead. --- .../Configuration/Hid/Controller/GamepadInputId.cs | 3 ++- src/Ryujinx/Headless/HeadlessRyujinx.Init.cs | 8 ++++---- src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs | 8 ++++---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Ryujinx.Common/Configuration/Hid/Controller/GamepadInputId.cs b/src/Ryujinx.Common/Configuration/Hid/Controller/GamepadInputId.cs index 1380813b0..3e317c47c 100644 --- a/src/Ryujinx.Common/Configuration/Hid/Controller/GamepadInputId.cs +++ b/src/Ryujinx.Common/Configuration/Hid/Controller/GamepadInputId.cs @@ -46,10 +46,11 @@ namespace Ryujinx.Common.Configuration.Hid.Controller // PS5 touchpad button Touchpad, - // Virtual buttons for single joycon + // Virtual buttons for single joycon (left) SingleLeftTrigger0, SingleRightTrigger0, + // Virtual buttons for single joycon (right) SingleLeftTrigger1, SingleRightTrigger1, diff --git a/src/Ryujinx/Headless/HeadlessRyujinx.Init.cs b/src/Ryujinx/Headless/HeadlessRyujinx.Init.cs index 226b310d6..7b1019bd5 100644 --- a/src/Ryujinx/Headless/HeadlessRyujinx.Init.cs +++ b/src/Ryujinx/Headless/HeadlessRyujinx.Init.cs @@ -175,8 +175,8 @@ namespace Ryujinx.Headless ButtonMinus = ConfigGamepadInputId.Minus, ButtonL = ConfigGamepadInputId.LeftShoulder, ButtonZl = ConfigGamepadInputId.LeftTrigger, - ButtonSl = ConfigGamepadInputId.Unbound, - ButtonSr = ConfigGamepadInputId.Unbound, + ButtonSl = ConfigGamepadInputId.SingleLeftTrigger0, + ButtonSr = ConfigGamepadInputId.SingleRightTrigger0, }, LeftJoyconStick = new JoyconConfigControllerStick @@ -197,8 +197,8 @@ namespace Ryujinx.Headless ButtonPlus = ConfigGamepadInputId.Plus, ButtonR = ConfigGamepadInputId.RightShoulder, ButtonZr = ConfigGamepadInputId.RightTrigger, - ButtonSl = ConfigGamepadInputId.Unbound, - ButtonSr = ConfigGamepadInputId.Unbound, + ButtonSl = ConfigGamepadInputId.SingleLeftTrigger1, + ButtonSr = ConfigGamepadInputId.SingleRightTrigger1, }, RightJoyconStick = new JoyconConfigControllerStick diff --git a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs index 9730ef07e..56aa9214a 100644 --- a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs @@ -634,8 +634,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input ButtonMinus = ConfigGamepadInputId.Minus, ButtonL = ConfigGamepadInputId.LeftShoulder, ButtonZl = ConfigGamepadInputId.LeftTrigger, - ButtonSl = ConfigGamepadInputId.Unbound, - ButtonSr = ConfigGamepadInputId.Unbound, + ButtonSl = ConfigGamepadInputId.SingleLeftTrigger0, + ButtonSr = ConfigGamepadInputId.SingleRightTrigger0, }, LeftJoyconStick = new JoyconConfigControllerStick { @@ -653,8 +653,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input ButtonPlus = ConfigGamepadInputId.Plus, ButtonR = ConfigGamepadInputId.RightShoulder, ButtonZr = ConfigGamepadInputId.RightTrigger, - ButtonSl = ConfigGamepadInputId.Unbound, - ButtonSr = ConfigGamepadInputId.Unbound, + ButtonSl = ConfigGamepadInputId.SingleLeftTrigger1, + ButtonSr = ConfigGamepadInputId.SingleRightTrigger1, }, RightJoyconStick = new JoyconConfigControllerStick {