1 files changed, 6 insertions, 22 deletions
diff --git a/src/Ryujinx.Ava/UI/Helpers/ButtonKeyAssigner.cs b/src/Ryujinx.Ava/UI/Helpers/ButtonKeyAssigner.cs
index 7e8ba734..54e0918a 100644
--- a/src/Ryujinx.Ava/UI/Helpers/ButtonKeyAssigner.cs
+++ b/src/Ryujinx.Ava/UI/Helpers/ButtonKeyAssigner.cs
@@ -1,11 +1,8 @@
-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
@@ -15,12 +12,12 @@ namespace Ryujinx.Ava.UI.Helpers
         internal class ButtonAssignedEventArgs : EventArgs
         {
             public ToggleButton Button { get; }
-            public bool IsAssigned { get; }
+            public ButtonValue? ButtonValue { get; }
 
-            public ButtonAssignedEventArgs(ToggleButton button, bool isAssigned)
+            public ButtonAssignedEventArgs(ToggleButton button, ButtonValue? buttonValue)
             {
                 Button = button;
-                IsAssigned = isAssigned;
+                ButtonValue = buttonValue;
             }
         }
 
@@ -78,15 +75,11 @@ namespace Ryujinx.Ava.UI.Helpers
 
             await Dispatcher.UIThread.InvokeAsync(() =>
             {
-                string pressedButton = assigner.GetPressedButton();
+                ButtonValue? pressedButton = assigner.GetPressedButton();
 
                 if (_shouldUnbind)
                 {
-                    SetButtonText(ToggledButton, "Unbound");
-                }
-                else if (pressedButton != "")
-                {
-                    SetButtonText(ToggledButton, pressedButton);
+                    pressedButton = null;
                 }
 
                 _shouldUnbind = false;
@@ -94,17 +87,8 @@ namespace Ryujinx.Ava.UI.Helpers
 
                 ToggledButton.IsChecked = false;
 
-                ButtonAssigned?.Invoke(this, new ButtonAssignedEventArgs(ToggledButton, pressedButton != null));
-
-                static void SetButtonText(ToggleButton button, string text)
-                {
-                    ILogical textBlock = button.GetLogicalDescendants().First(x => x is TextBlock);
+                ButtonAssigned?.Invoke(this, new ButtonAssignedEventArgs(ToggledButton, pressedButton));
 
-                    if (textBlock != null && textBlock is TextBlock block)
-                    {
-                        block.Text = text;
-                    }
-                }
             });
         }