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

This reverts commit 49b37550cae6b3c69f59a9c7a44b17e3c12a813b.

This currently breaks the GTK GUI.

4 files changed, 9 insertions, 57 deletions

diff --git a/src/Ryujinx.Input/Assigner/GamepadButtonAssigner.cs b/src/Ryujinx.Input/Assigner/GamepadButtonAssigner.cs
index bf8319a6..388ebcc0 100644
--- a/src/Ryujinx.Input/Assigner/GamepadButtonAssigner.cs
+++ b/src/Ryujinx.Input/Assigner/GamepadButtonAssigner.cs
@@ -59,16 +59,16 @@ namespace Ryujinx.Input.Assigner
             return _gamepad == null || !_gamepad.IsConnected;
         }
 
-        public ButtonValue? GetPressedButton()
+        public string GetPressedButton()
         {
             IEnumerable<GamepadButtonInputId> pressedButtons = _detector.GetPressedButtons();
 
             if (pressedButtons.Any())
             {
-                return !_forStick ? new(pressedButtons.First()) : new(((StickInputId)pressedButtons.First()));
+                return !_forStick ? pressedButtons.First().ToString() : ((StickInputId)pressedButtons.First()).ToString();
             }
 
-            return null;
+            return "";
         }
 
         private void CollectButtonStats()
diff --git a/src/Ryujinx.Input/Assigner/IButtonAssigner.cs b/src/Ryujinx.Input/Assigner/IButtonAssigner.cs
index 65371713..76a9fece 100644
--- a/src/Ryujinx.Input/Assigner/IButtonAssigner.cs
+++ b/src/Ryujinx.Input/Assigner/IButtonAssigner.cs
@@ -31,6 +31,6 @@ namespace Ryujinx.Input.Assigner
         /// Get the pressed button that was read in <see cref="ReadInput"/> by the button assigner.
         /// </summary>
         /// <returns>The pressed button that was read</returns>
-        ButtonValue? GetPressedButton();
+        string GetPressedButton();
     }
 }
diff --git a/src/Ryujinx.Input/Assigner/KeyboardKeyAssigner.cs b/src/Ryujinx.Input/Assigner/KeyboardKeyAssigner.cs
index c66812ba..e52ef4a2 100644
--- a/src/Ryujinx.Input/Assigner/KeyboardKeyAssigner.cs
+++ b/src/Ryujinx.Input/Assigner/KeyboardKeyAssigner.cs
@@ -23,7 +23,7 @@ namespace Ryujinx.Input.Assigner
 
         public bool HasAnyButtonPressed()
         {
-            return GetPressedButton() is not null;
+            return GetPressedButton().Length != 0;
         }
 
         public bool ShouldCancel()
@@ -31,20 +31,20 @@ namespace Ryujinx.Input.Assigner
             return _keyboardState.IsPressed(Key.Escape);
         }
 
-        public ButtonValue? GetPressedButton()
+        public string GetPressedButton()
         {
-            ButtonValue? keyPressed = null;
+            string keyPressed = "";
 
             for (Key key = Key.Unknown; key < Key.Count; key++)
             {
                 if (_keyboardState.IsPressed(key))
                 {
-                    keyPressed = new(key);
+                    keyPressed = key.ToString();
                     break;
                 }
             }
 
-            return !ShouldCancel() ? keyPressed : null;
+            return !ShouldCancel() ? keyPressed : "";
         }
     }
 }
diff --git a/src/Ryujinx.Input/ButtonValue.cs b/src/Ryujinx.Input/ButtonValue.cs
deleted file mode 100644
index f037e6b6..00000000
--- a/src/Ryujinx.Input/ButtonValue.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System.Diagnostics;
-
-namespace Ryujinx.Input
-{
-    public enum ButtonValueType { Key, GamepadButtonInputId, StickId }
-
-    public readonly struct ButtonValue
-    {
-        private readonly ButtonValueType _type;
-        private readonly uint _rawValue;
-
-        public ButtonValue(Key key)
-        {
-            _type = ButtonValueType.Key;
-            _rawValue = (uint)key;
-        }
-
-        public ButtonValue(GamepadButtonInputId gamepad)
-        {
-            _type = ButtonValueType.GamepadButtonInputId;
-            _rawValue = (uint)gamepad;
-        }
-
-        public ButtonValue(StickInputId stick)
-        {
-            _type = ButtonValueType.StickId;
-            _rawValue = (uint)stick;
-        }
-
-        public Common.Configuration.Hid.Key AsKey()
-        {
-            Debug.Assert(_type == ButtonValueType.Key);
-            return (Common.Configuration.Hid.Key)_rawValue;
-        }
-
-        public Common.Configuration.Hid.Controller.GamepadInputId AsGamepadButtonInputId()
-        {
-            Debug.Assert(_type == ButtonValueType.GamepadButtonInputId);
-            return (Common.Configuration.Hid.Controller.GamepadInputId)_rawValue;
-        }
-
-        public Common.Configuration.Hid.Controller.StickInputId AsGamepadStickId()
-        {
-            Debug.Assert(_type == ButtonValueType.StickId);
-            return (Common.Configuration.Hid.Controller.StickInputId)_rawValue;
-        }
-    }
-}