From 638be5f296bf52943da4366699d33f1e8656e00c Mon Sep 17 00:00:00 2001
From: TSR Berry <20988865+TSRBerry@users.noreply.github.com>
Date: Sat, 21 Oct 2023 15:19:21 +0200
Subject: Revert "Ava UI: Input Menu Refactor (#4998)"
This reverts commit 49b37550cae6b3c69f59a9c7a44b17e3c12a813b.
This currently breaks the GTK GUI.
---
src/Ryujinx.Input/Assigner/KeyboardKeyAssigner.cs | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'src/Ryujinx.Input/Assigner/KeyboardKeyAssigner.cs')
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 : "";
}
}
}
--
cgit v1.2.3-70-g09d2