mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mac keys in locale

Browse source
This commit is contained in:
Isaac Marovitz 2024-04-05 13:14:48 -04:00
commit 3e7d3e764c
No known key found for this signature in database
GPG key ID: 97250B2B09A132E1
2 changed files with 30 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/Ryujinx/Assets/Locales/en_US.json
View file

@ -269,8 +269,18 @@
"KeyUnknown": "Unknown", "KeyUnknown": "Unknown",
"KeyShiftLeft": "Shift Left", "KeyShiftLeft": "Shift Left",
"KeyShiftRight": "Shift Right", "KeyShiftRight": "Shift Right",
"KeySideLeft": "Left", "KeyControlLeft": "Ctrl Left",
"KeySideRight": "Right", "KeyMacControlLeft": "⌃ Left",
"KeyControlRight": "Ctrl Right",
"KeyMacControlRight": "⌃ Right",
"KeyAltLeft": "Alt Left",
"KeyMacAltLeft": "⌥ Left",
"KeyAltRight": "Alt Right",
"KeyMacAltRight": "⌥ Right",
"KeyWinLeft": "⊞ Left",
"KeyMacWinLeft": "⌘ Left",
"KeyWinRight": "⊞ Right",
"KeyMacWinRight": "⌘ Right",
"KeyMenu": "Menu", "KeyMenu": "Menu",
"KeyUp": "Up", "KeyUp": "Up",
"KeyDown": "Down", "KeyDown": "Down",

40
src/Ryujinx/UI/Helpers/KeyValueConverter.cs
View file

@ -17,12 +17,12 @@ namespace Ryujinx.Ava.UI.Helpers
{ Key.Unknown, LocaleKeys.KeyUnknown }, { Key.Unknown, LocaleKeys.KeyUnknown },
{ Key.ShiftLeft, LocaleKeys.KeyShiftLeft }, { Key.ShiftLeft, LocaleKeys.KeyShiftLeft },
{ Key.ShiftRight, LocaleKeys.KeyShiftRight }, { Key.ShiftRight, LocaleKeys.KeyShiftRight },
{ Key.ControlLeft, LocaleKeys.KeySideLeft }, { Key.ControlLeft, LocaleKeys.KeyControlLeft },
{ Key.ControlRight, LocaleKeys.KeySideRight }, { Key.ControlRight, LocaleKeys.KeyControlRight },
{ Key.AltLeft, LocaleKeys.KeySideLeft }, { Key.AltLeft, LocaleKeys.KeyControlLeft },
{ Key.AltRight, LocaleKeys.KeySideRight }, { Key.AltRight, LocaleKeys.KeyControlRight },
{ Key.WinLeft, LocaleKeys.KeySideLeft }, { Key.WinLeft, LocaleKeys.KeyWinLeft },
{ Key.WinRight, LocaleKeys.KeySideRight }, { Key.WinRight, LocaleKeys.KeyWinRight },
{ Key.Up, LocaleKeys.KeyUp }, { Key.Up, LocaleKeys.KeyUp },
{ Key.Down, LocaleKeys.KeyDown }, { Key.Down, LocaleKeys.KeyDown },
{ Key.Left, LocaleKeys.KeyLeft }, { Key.Left, LocaleKeys.KeyLeft },
@ -128,25 +128,21 @@ namespace Ryujinx.Ava.UI.Helpers
{ {
if (_keysMap.TryGetValue(key, out LocaleKeys localeKey)) if (_keysMap.TryGetValue(key, out LocaleKeys localeKey))
{ {
var symbol = ""; if (OperatingSystem.IsMacOS())
switch (key)
{ {
case Key.ControlLeft: localeKey = localeKey switch
case Key.ControlRight: {
symbol = OperatingSystem.IsMacOS() ? "⌃ " : "Ctrl "; LocaleKeys.KeyControlLeft => LocaleKeys.KeyMacControlLeft,
break; LocaleKeys.KeyControlRight => LocaleKeys.KeyMacControlRight,
case Key.WinLeft: LocaleKeys.KeyAltLeft => LocaleKeys.KeyMacAltLeft,
case Key.WinRight: LocaleKeys.KeyAltRight => LocaleKeys.KeyMacAltRight,
symbol = OperatingSystem.IsMacOS() ? "⌘ " : "⊞ "; LocaleKeys.KeyWinLeft => LocaleKeys.KeyMacWinLeft,
break; LocaleKeys.KeyWinRight => LocaleKeys.KeyMacWinRight,
case Key.AltLeft: _ => localeKey
case Key.AltRight: };
symbol = OperatingSystem.IsMacOS() ? "⌥ " : "Alt ";
break;
} }
keyString = symbol + LocaleManager.Instance[localeKey]; keyString = LocaleManager.Instance[localeKey];
} }
else else
{ {