diff options
| author | Mary <mary@mary.zone> | 2023-07-06 18:08:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-06 18:08:14 +0200 |
| commit | 8a363b5df2387bd254a3dd48bfd3c9884ff74dab (patch) | |
| tree | fbe6f52943b04febdad14be7934881502af8a4a2 /src/Ryujinx/Ui/Windows/ControllerWindow.cs | |
| parent | 2b5abac809dacb351ec69e322732d45ea01a4d65 (diff) | |
Revert "sdl: set `SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS` to 0 (#5433)" (#5439)1.1.955
This reverts commit 2b5abac809dacb351ec69e322732d45ea01a4d65.
Diffstat (limited to 'src/Ryujinx/Ui/Windows/ControllerWindow.cs')
| -rw-r--r-- | src/Ryujinx/Ui/Windows/ControllerWindow.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Ryujinx/Ui/Windows/ControllerWindow.cs b/src/Ryujinx/Ui/Windows/ControllerWindow.cs index 2993e1f2..ebf22ab6 100644 --- a/src/Ryujinx/Ui/Windows/ControllerWindow.cs +++ b/src/Ryujinx/Ui/Windows/ControllerWindow.cs @@ -1035,6 +1035,8 @@ namespace Ryujinx.Ui.Windows } else if (_inputDevice.ActiveId.StartsWith("controller")) { + bool isNintendoStyle = _inputDevice.ActiveText.Contains("Nintendo"); + config = new StandardControllerInputConfig { Version = InputConfig.CurrentVersion, @@ -1070,10 +1072,10 @@ namespace Ryujinx.Ui.Windows RightJoycon = new RightJoyconCommonConfig<ConfigGamepadInputId> { - ButtonA = ConfigGamepadInputId.B, - ButtonB = ConfigGamepadInputId.A, - ButtonX = ConfigGamepadInputId.Y, - ButtonY = ConfigGamepadInputId.X, + ButtonA = isNintendoStyle ? ConfigGamepadInputId.A : ConfigGamepadInputId.B, + ButtonB = isNintendoStyle ? ConfigGamepadInputId.B : ConfigGamepadInputId.A, + ButtonX = isNintendoStyle ? ConfigGamepadInputId.X : ConfigGamepadInputId.Y, + ButtonY = isNintendoStyle ? ConfigGamepadInputId.Y : ConfigGamepadInputId.X, ButtonPlus = ConfigGamepadInputId.Plus, ButtonR = ConfigGamepadInputId.RightShoulder, ButtonZr = ConfigGamepadInputId.RightTrigger, |