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
parent 52756d0704
commit 3e7d3e764c
No known key found for this signature in database
GPG key ID: 97250B2B09A132E1
2 changed files with 30 additions and 24 deletions
Show stats 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",
"KeyShiftLeft": "Shift Left",
"KeyShiftRight": "Shift Right",
"KeySideLeft": "Left",
"KeySideRight": "Right",
"KeyControlLeft": "Ctrl Left",
"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",
"KeyUp": "Up",
"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.ShiftLeft, LocaleKeys.KeyShiftLeft },
{ Key.ShiftRight, LocaleKeys.KeyShiftRight },
{ Key.ControlLeft, LocaleKeys.KeySideLeft },
{ Key.ControlRight, LocaleKeys.KeySideRight },
{ Key.AltLeft, LocaleKeys.KeySideLeft },
{ Key.AltRight, LocaleKeys.KeySideRight },
{ Key.WinLeft, LocaleKeys.KeySideLeft },
{ Key.WinRight, LocaleKeys.KeySideRight },
{ Key.ControlLeft, LocaleKeys.KeyControlLeft },
{ Key.ControlRight, LocaleKeys.KeyControlRight },
{ Key.AltLeft, LocaleKeys.KeyControlLeft },
{ Key.AltRight, LocaleKeys.KeyControlRight },
{ Key.WinLeft, LocaleKeys.KeyWinLeft },
{ Key.WinRight, LocaleKeys.KeyWinRight },
{ Key.Up, LocaleKeys.KeyUp },
{ Key.Down, LocaleKeys.KeyDown },
{ Key.Left, LocaleKeys.KeyLeft },
@ -128,25 +128,21 @@ namespace Ryujinx.Ava.UI.Helpers
{
if (_keysMap.TryGetValue(key, out LocaleKeys localeKey))
{
var symbol = "";
switch (key)
if (OperatingSystem.IsMacOS())
{
case Key.ControlLeft:
case Key.ControlRight:
symbol = OperatingSystem.IsMacOS() ? "⌃ " : "Ctrl ";
break;
case Key.WinLeft:
case Key.WinRight:
symbol = OperatingSystem.IsMacOS() ? "⌘ " : "⊞ ";
break;
case Key.AltLeft:
case Key.AltRight:
symbol = OperatingSystem.IsMacOS() ? "⌥ " : "Alt ";
break;
localeKey = localeKey switch
{
LocaleKeys.KeyControlLeft => LocaleKeys.KeyMacControlLeft,
LocaleKeys.KeyControlRight => LocaleKeys.KeyMacControlRight,
LocaleKeys.KeyAltLeft => LocaleKeys.KeyMacAltLeft,
LocaleKeys.KeyAltRight => LocaleKeys.KeyMacAltRight,
LocaleKeys.KeyWinLeft => LocaleKeys.KeyMacWinLeft,
LocaleKeys.KeyWinRight => LocaleKeys.KeyMacWinRight,
_ => localeKey
};
}
keyString = symbol + LocaleManager.Instance[localeKey];
keyString = LocaleManager.Instance[localeKey];
}
else
{