Revert "Ava UI: Input Menu Refactor (#4998)"

This reverts commit 49b3755.

This currently breaks the GTK GUI.

src/Ryujinx.Ava/Assets/Locales/en_US.json

@@ -263,105 +263,6 @@
  "ControllerSettingsMotionGyroDeadzone": "Gyro Deadzone:",
  "ControllerSettingsSave": "Save",
  "ControllerSettingsClose": "Close",
- "KeyUnknown": "Unknown",
- "KeyShiftLeft": "Shift Left",
- "KeyShiftRight": "Shift Right",
- "KeyControlLeft": "Control Left",
- "KeyControlRight": "Control Right",
- "KeyAltLeft": "Alt Left",
- "KeyAltRight": "Alt Right",
- "KeyOptLeft": "⌥ Left",
- "KeyOptRight": "⌥ Right",
- "KeyWinLeft": "⊞ Left",
- "KeyWinRight": "⊞ Right",
- "KeyCmdLeft": "⌘ Left",
- "KeyCmdRight": "⌘ Right",
- "KeyMenu": "Menu",
- "KeyUp": "Up",
- "KeyDown": "Down",
- "KeyLeft": "Left",
- "KeyRight": "Right",
- "KeyEnter": "Enter",
- "KeyEscape": "Escape",
- "KeySpace": "Space",
- "KeyTab": "Tab",
- "KeyBackSpace": "Backspace",
- "KeyInsert": "Insert",
- "KeyDelete": "Delete",
- "KeyPageUp": "Page Up",
- "KeyPageDown": "Page Down",
- "KeyHome": "Home",
- "KeyEnd": "End",
- "KeyCapsLock": "Caps Lock",
- "KeyScrollLock": "Scroll Lock",
- "KeyPrintScreen": "Print Screen",
- "KeyPause": "Pause",
- "KeyNumLock": "Num Lock",
- "KeyClear": "Clear",
- "KeyKeypad0": "Keypad 0",
- "KeyKeypad1": "Keypad 1",
- "KeyKeypad2": "Keypad 2",
- "KeyKeypad3": "Keypad 3",
- "KeyKeypad4": "Keypad 4",
- "KeyKeypad5": "Keypad 5",
- "KeyKeypad6": "Keypad 6",
- "KeyKeypad7": "Keypad 7",
- "KeyKeypad8": "Keypad 8",
- "KeyKeypad9": "Keypad 9",
- "KeyKeypadDivide": "Keypad Divide",
- "KeyKeypadMultiply": "Keypad Multiply",
- "KeyKeypadSubtract": "Keypad Subtract",
- "KeyKeypadAdd": "Keypad Add",
- "KeyKeypadDecimal": "Keypad Decimal",
- "KeyKeypadEnter": "Keypad Enter",
- "KeyNumber0": "0",
- "KeyNumber1": "1",
- "KeyNumber2": "2",
- "KeyNumber3": "3",
- "KeyNumber4": "4",
- "KeyNumber5": "5",
- "KeyNumber6": "6",
- "KeyNumber7": "7",
- "KeyNumber8": "8",
- "KeyNumber9": "9",
- "KeyTilde": "~",
- "KeyGrave": "`",
- "KeyMinus": "-",
- "KeyPlus": "+",
- "KeyBracketLeft": "[",
- "KeyBracketRight": "]",
- "KeySemicolon": ";",
- "KeyQuote": "\"",
- "KeyComma": ",",
- "KeyPeriod": ".",
- "KeySlash": "/",
- "KeyBackSlash": "\\",
- "KeyUnbound": "Unbound",
- "GamepadLeftStick": "Left Stick Button",
- "GamepadRightStick": "Right Stick Button",
- "GamepadLeftShoulder": "Left Shoulder",
- "GamepadRightShoulder": "Right Shoulder",
- "GamepadLeftTrigger": "Left Trigger",
- "GamepadRightTrigger": "Right Trigger",
- "GamepadDpadUp": "Up",
- "GamepadDpadDown": "Down",
- "GamepadDpadLeft": "Left",
- "GamepadDpadRight": "Right",
- "GamepadMinus": "-",
- "GamepadPlus": "+",
- "GamepadGuide": "Guide",
- "GamepadMisc1": "Misc",
- "GamepadPaddle1": "Paddle 1",
- "GamepadPaddle2": "Paddle 2",
- "GamepadPaddle3": "Paddle 3",
- "GamepadPaddle4": "Paddle 4",
- "GamepadTouchpad": "Touchpad",
- "GamepadSingleLeftTrigger0": "Left Trigger 0",
- "GamepadSingleRightTrigger0": "Right Trigger 0",
- "GamepadSingleLeftTrigger1": "Left Trigger 1",
- "GamepadSingleRightTrigger1": "Right Trigger 1",
- "StickLeft": "Left Stick",
- "StickRight": "Right Stick",
  "UserProfilesSelectedUserProfile": "Selected User Profile:",
  "UserProfilesSaveProfileName": "Save Profile Name",
  "UserProfilesChangeProfileImage": "Change Profile Image",

src/Ryujinx.Ava/Assets/Styles/Styles.xaml

@@ -15,7 +15,8 @@
  <MenuItem Header="Test 2" />
  <MenuItem Header="Test 3">
  <MenuItem.Icon>
- <CheckBox Margin="0" />
+ <CheckBox Margin="0"
+ IsChecked="{ReflectionBinding Checkbox, Mode=TwoWay}" />
  </MenuItem.Icon>
  </MenuItem>
  </MenuItem>
@@ -392,4 +393,4 @@
  <x:Double x:Key="ContentDialogMaxWidth">600</x:Double>
  <x:Double x:Key="ContentDialogMaxHeight">756</x:Double>
  </Styles.Resources>
-</Styles>
+</Styles>

src/Ryujinx.Ava/UI/Helpers/ButtonKeyAssigner.cs

@@ -1,8 +1,11 @@
+using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
+using Avalonia.LogicalTree;
 using Avalonia.Threading;
 using Ryujinx.Input;
 using Ryujinx.Input.Assigner;
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Helpers
@@ -12,12 +15,12 @@ internal class ButtonKeyAssigner
  internal class ButtonAssignedEventArgs : EventArgs
  {
  public ToggleButton Button { get; }
- public ButtonValue? ButtonValue { get; }
+ public bool IsAssigned { get; }
 
- public ButtonAssignedEventArgs(ToggleButton button, ButtonValue? buttonValue)
+ public ButtonAssignedEventArgs(ToggleButton button, bool isAssigned)
  {
  Button = button;
- ButtonValue = buttonValue;
+ IsAssigned = isAssigned;
  }
  }
 
@@ -75,20 +78,33 @@ await Task.Run(async () =>
 
  await Dispatcher.UIThread.InvokeAsync(() =>
  {
- ButtonValue? pressedButton = assigner.GetPressedButton();
+ string pressedButton = assigner.GetPressedButton();
 
  if (_shouldUnbind)
  {
- pressedButton = null;
+ SetButtonText(ToggledButton, "Unbound");
+ }
+ else if (pressedButton != "")
+ {
+ SetButtonText(ToggledButton, pressedButton);
  }
 
  _shouldUnbind = false;
  _isWaitingForInput = false;
 
  ToggledButton.IsChecked = false;
 
- ButtonAssigned?.Invoke(this, new ButtonAssignedEventArgs(ToggledButton, pressedButton));
+ ButtonAssigned?.Invoke(this, new ButtonAssignedEventArgs(ToggledButton, pressedButton != null));
+
+ static void SetButtonText(ToggleButton button, string text)
+ {
+ ILogical textBlock = button.GetLogicalDescendants().First(x => x is TextBlock);
 
+ if (textBlock != null && textBlock is TextBlock block)
+ {
+ block.Text = text;
+ }
+ }
  });
  }
 

src/Ryujinx.Ava/UI/Helpers/KeyValueConverter.cs

@@ -1,9 +1,7 @@
 using Avalonia.Data.Converters;
-using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Controller;
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 
 namespace Ryujinx.Ava.UI.Helpers
@@ -12,158 +10,37 @@ internal class KeyValueConverter : IValueConverter
  {
  public static KeyValueConverter Instance = new();
 
- private static readonly Dictionary<Key, LocaleKeys> _keysMap = new()
- {
- { Key.Unknown, LocaleKeys.KeyUnknown },
- { Key.ShiftLeft, LocaleKeys.KeyShiftLeft },
- { Key.ShiftRight, LocaleKeys.KeyShiftRight },
- { Key.ControlLeft, LocaleKeys.KeyControlLeft },
- { Key.ControlRight, LocaleKeys.KeyControlRight },
- { Key.AltLeft, OperatingSystem.IsMacOS() ? LocaleKeys.KeyOptLeft : LocaleKeys.KeyAltLeft },
- { Key.AltRight, OperatingSystem.IsMacOS() ? LocaleKeys.KeyOptRight : LocaleKeys.KeyAltRight },
- { Key.WinLeft, OperatingSystem.IsMacOS() ? LocaleKeys.KeyCmdLeft : LocaleKeys.KeyWinLeft },
- { Key.WinRight, OperatingSystem.IsMacOS() ? LocaleKeys.KeyCmdRight : LocaleKeys.KeyWinRight },
- { Key.Up, LocaleKeys.KeyUp },
- { Key.Down, LocaleKeys.KeyDown },
- { Key.Left, LocaleKeys.KeyLeft },
- { Key.Right, LocaleKeys.KeyRight },
- { Key.Enter, LocaleKeys.KeyEnter },
- { Key.Escape, LocaleKeys.KeyEscape },
- { Key.Space, LocaleKeys.KeySpace },
- { Key.Tab, LocaleKeys.KeyTab },
- { Key.BackSpace, LocaleKeys.KeyBackSpace },
- { Key.Insert, LocaleKeys.KeyInsert },
- { Key.Delete, LocaleKeys.KeyDelete },
- { Key.PageUp, LocaleKeys.KeyPageUp },
- { Key.PageDown, LocaleKeys.KeyPageDown },
- { Key.Home, LocaleKeys.KeyHome },
- { Key.End, LocaleKeys.KeyEnd },
- { Key.CapsLock, LocaleKeys.KeyCapsLock },
- { Key.ScrollLock, LocaleKeys.KeyScrollLock },
- { Key.PrintScreen, LocaleKeys.KeyPrintScreen },
- { Key.Pause, LocaleKeys.KeyPause },
- { Key.NumLock, LocaleKeys.KeyNumLock },
- { Key.Clear, LocaleKeys.KeyClear },
- { Key.Keypad0, LocaleKeys.KeyKeypad0 },
- { Key.Keypad1, LocaleKeys.KeyKeypad1 },
- { Key.Keypad2, LocaleKeys.KeyKeypad2 },
- { Key.Keypad3, LocaleKeys.KeyKeypad3 },
- { Key.Keypad4, LocaleKeys.KeyKeypad4 },
- { Key.Keypad5, LocaleKeys.KeyKeypad5 },
- { Key.Keypad6, LocaleKeys.KeyKeypad6 },
- { Key.Keypad7, LocaleKeys.KeyKeypad7 },
- { Key.Keypad8, LocaleKeys.KeyKeypad8 },
- { Key.Keypad9, LocaleKeys.KeyKeypad9 },
- { Key.KeypadDivide, LocaleKeys.KeyKeypadDivide },
- { Key.KeypadMultiply, LocaleKeys.KeyKeypadMultiply },
- { Key.KeypadSubtract, LocaleKeys.KeyKeypadSubtract },
- { Key.KeypadAdd, LocaleKeys.KeyKeypadAdd },
- { Key.KeypadDecimal, LocaleKeys.KeyKeypadDecimal },
- { Key.KeypadEnter, LocaleKeys.KeyKeypadEnter },
- { Key.Number0, LocaleKeys.KeyNumber0 },
- { Key.Number1, LocaleKeys.KeyNumber1 },
- { Key.Number2, LocaleKeys.KeyNumber2 },
- { Key.Number3, LocaleKeys.KeyNumber3 },
- { Key.Number4, LocaleKeys.KeyNumber4 },
- { Key.Number5, LocaleKeys.KeyNumber5 },
- { Key.Number6, LocaleKeys.KeyNumber6 },
- { Key.Number7, LocaleKeys.KeyNumber7 },
- { Key.Number8, LocaleKeys.KeyNumber8 },
- { Key.Number9, LocaleKeys.KeyNumber9 },
- { Key.Tilde, LocaleKeys.KeyTilde },
- { Key.Grave, LocaleKeys.KeyGrave },
- { Key.Minus, LocaleKeys.KeyMinus },
- { Key.Plus, LocaleKeys.KeyPlus },
- { Key.BracketLeft, LocaleKeys.KeyBracketLeft },
- { Key.BracketRight, LocaleKeys.KeyBracketRight },
- { Key.Semicolon, LocaleKeys.KeySemicolon },
- { Key.Quote, LocaleKeys.KeyQuote },
- { Key.Comma, LocaleKeys.KeyComma },
- { Key.Period, LocaleKeys.KeyPeriod },
- { Key.Slash, LocaleKeys.KeySlash },
- { Key.BackSlash, LocaleKeys.KeyBackSlash },
- { Key.Unbound, LocaleKeys.KeyUnbound },
- };
-
- private static readonly Dictionary<GamepadInputId, LocaleKeys> _gamepadInputIdMap = new()
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
  {
- { GamepadInputId.LeftStick, LocaleKeys.GamepadLeftStick },
- { GamepadInputId.RightStick, LocaleKeys.GamepadRightStick },
- { GamepadInputId.LeftShoulder, LocaleKeys.GamepadLeftShoulder },
- { GamepadInputId.RightShoulder, LocaleKeys.GamepadRightShoulder },
- { GamepadInputId.LeftTrigger, LocaleKeys.GamepadLeftTrigger },
- { GamepadInputId.RightTrigger, LocaleKeys.GamepadRightTrigger },
- { GamepadInputId.DpadUp, LocaleKeys.GamepadDpadUp},
- { GamepadInputId.DpadDown, LocaleKeys.GamepadDpadDown},
- { GamepadInputId.DpadLeft, LocaleKeys.GamepadDpadLeft},
- { GamepadInputId.DpadRight, LocaleKeys.GamepadDpadRight},
- { GamepadInputId.Minus, LocaleKeys.GamepadMinus},
- { GamepadInputId.Plus, LocaleKeys.GamepadPlus},
- { GamepadInputId.Guide, LocaleKeys.GamepadGuide},
- { GamepadInputId.Misc1, LocaleKeys.GamepadMisc1},
- { GamepadInputId.Paddle1, LocaleKeys.GamepadPaddle1},
- { GamepadInputId.Paddle2, LocaleKeys.GamepadPaddle2},
- { GamepadInputId.Paddle3, LocaleKeys.GamepadPaddle3},
- { GamepadInputId.Paddle4, LocaleKeys.GamepadPaddle4},
- { GamepadInputId.Touchpad, LocaleKeys.GamepadTouchpad},
- { GamepadInputId.SingleLeftTrigger0, LocaleKeys.GamepadSingleLeftTrigger0},
- { GamepadInputId.SingleRightTrigger0, LocaleKeys.GamepadSingleRightTrigger0},
- { GamepadInputId.SingleLeftTrigger1, LocaleKeys.GamepadSingleLeftTrigger1},
- { GamepadInputId.SingleRightTrigger1, LocaleKeys.GamepadSingleRightTrigger1},
- { GamepadInputId.Unbound, LocaleKeys.KeyUnbound},
- };
+ if (value == null)
+ {
+ return null;
+ }
 
- private static readonly Dictionary<StickInputId, LocaleKeys> _stickInputIdMap = new()
- {
- { StickInputId.Left, LocaleKeys.StickLeft},
- { StickInputId.Right, LocaleKeys.StickRight},
- { StickInputId.Unbound, LocaleKeys.KeyUnbound},
- };
+ return value.ToString();
+ }
 
- public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
  {
- string keyString = "";
+ object key = null;
 
- if (value is Key key)
+ if (value != null)
  {
- if (_keysMap.TryGetValue(key, out LocaleKeys localeKey))
+ if (targetType == typeof(Key))
  {
- keyString = LocaleManager.Instance[localeKey];
+ key = Enum.Parse<Key>(value.ToString());
  }
- else
+ else if (targetType == typeof(GamepadInputId))
  {
- keyString = key.ToString();
+ key = Enum.Parse<GamepadInputId>(value.ToString());
  }
- }
- else if (value is GamepadInputId gamepadInputId)
- {
- if (_gamepadInputIdMap.TryGetValue(gamepadInputId, out LocaleKeys localeKey))
+ else if (targetType == typeof(StickInputId))
  {
- keyString = LocaleManager.Instance[localeKey];
- }
- else
- {
- keyString = gamepadInputId.ToString();
+ key = Enum.Parse<StickInputId>(value.ToString());
  }
  }
- else if (value is StickInputId stickInputId)
- {
- if (_stickInputIdMap.TryGetValue(stickInputId, out LocaleKeys localeKey))
- {
- keyString = LocaleManager.Instance[localeKey];
- }
- else
- {
- keyString = stickInputId.ToString();
- }
- }
-
- return keyString;
- }
 
- public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
- {
- throw new NotSupportedException();
+ return key;
  }
  }
 }