mirrors/ryujinx
0
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-12-14 19:36:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'input-mapping-simplification' into ui-input-and-mapping-simplification

Browse source
This commit is contained in:
_Neo_ 2025-11-29 14:03:56 +02:00
commit da928f5e5d
3 changed files with 1160 additions and 1490 deletions
Download patch file Download diff file Expand all files Collapse all files

2631
assets/locales.json
View file

File diff suppressed because it is too large Load diff

8
src/Ryujinx/UI/Helpers/ButtonKeyAssigner.cs
View file

@ -82,13 +82,7 @@ namespace Ryujinx.Ava.UI.Helpers
_isWaitingForInput = false; _isWaitingForInput = false;
ToggledButton.IsChecked = false; ToggledButton.IsChecked = false;
if (pressedButton.HasValue && pressedButton.Value.AsHidType<Key>() == Key.BackSpace)
{
ButtonAssigned?.Invoke(this, new ButtonAssignedEventArgs(ToggledButton, new Button(Key.Unbound)));
return;
}
ButtonAssigned?.Invoke(this, new ButtonAssignedEventArgs(ToggledButton, pressedButton)); ButtonAssigned?.Invoke(this, new ButtonAssignedEventArgs(ToggledButton, pressedButton));
}); });
} }

11
src/Ryujinx/UI/Helpers/Converters/KeyValueConverter.cs
View file

@ -82,6 +82,7 @@ namespace Ryujinx.Ava.UI.Helpers
{ Key.Period, LocaleKeys.KeyPeriod }, { Key.Period, LocaleKeys.KeyPeriod },
{ Key.Slash, LocaleKeys.KeySlash }, { Key.Slash, LocaleKeys.KeySlash },
{ Key.BackSlash, LocaleKeys.KeyBackSlash }, { Key.BackSlash, LocaleKeys.KeyBackSlash },
{ Key.Menu, LocaleKeys.KeyMenu },
{ Key.Unbound, LocaleKeys.KeyUnbound }, { Key.Unbound, LocaleKeys.KeyUnbound },
}; };
@ -93,13 +94,13 @@ namespace Ryujinx.Ava.UI.Helpers
{ GamepadInputId.RightShoulder, LocaleKeys.GamepadRightShoulder }, { GamepadInputId.RightShoulder, LocaleKeys.GamepadRightShoulder },
{ GamepadInputId.LeftTrigger, LocaleKeys.GamepadLeftTrigger }, { GamepadInputId.LeftTrigger, LocaleKeys.GamepadLeftTrigger },
{ GamepadInputId.RightTrigger, LocaleKeys.GamepadRightTrigger }, { GamepadInputId.RightTrigger, LocaleKeys.GamepadRightTrigger },
{ GamepadInputId.DpadUp, LocaleKeys.GamepadDpadUp}, { GamepadInputId.DpadUp, LocaleKeys.KeyUp},
{ GamepadInputId.DpadDown, LocaleKeys.GamepadDpadDown}, { GamepadInputId.DpadDown, LocaleKeys.KeyDown},
{ GamepadInputId.DpadLeft, LocaleKeys.GamepadDpadLeft}, { GamepadInputId.DpadLeft, LocaleKeys.KeyLeft},
{ GamepadInputId.DpadRight, LocaleKeys.GamepadDpadRight}, { GamepadInputId.DpadRight, LocaleKeys.KeyRight},
{ GamepadInputId.Minus, LocaleKeys.GamepadMinus}, { GamepadInputId.Minus, LocaleKeys.GamepadMinus},
{ GamepadInputId.Plus, LocaleKeys.GamepadPlus}, { GamepadInputId.Plus, LocaleKeys.GamepadPlus},
{ GamepadInputId.Guide, LocaleKeys.GamepadGuide}, { GamepadInputId.Guide, LocaleKeys.KeyMenu},
{ GamepadInputId.Misc1, LocaleKeys.GamepadMisc1}, { GamepadInputId.Misc1, LocaleKeys.GamepadMisc1},
{ GamepadInputId.Paddle1, LocaleKeys.GamepadPaddle1}, { GamepadInputId.Paddle1, LocaleKeys.GamepadPaddle1},
{ GamepadInputId.Paddle2, LocaleKeys.GamepadPaddle2}, { GamepadInputId.Paddle2, LocaleKeys.GamepadPaddle2},