1
1
mirror of https://github.com/ryujinx-mirror/ryujinx.git synced 2025-09-01 13:16:26 -05:00

Revert "sdl: set SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS to 0 (#5433)" (#5439)

This reverts commit 2b5abac809.
This commit is contained in:
Mary
2023-07-06 18:08:14 +02:00
committed by GitHub
parent 2b5abac809
commit 8a363b5df2
4 changed files with 18 additions and 13 deletions

View File

@@ -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,