fix: Address review

AvaloniaUI · Aug 12, 2024 · 0d7ee20 · 0d7ee20
1 parent 122b204
commit 0d7ee20
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs
@@ -291,7 +291,7 @@ protected override void OnKeyDown(KeyEventArgs e)
                     break;
                 case Key.Space:
                     // Handle Space only current focus control
-                    if (TopLevel.GetTopLevel(this)?.FocusManager?.GetFocusedElement() == this)
+                    if (IsFocused)
                     {
                         if (ClickMode == ClickMode.Press)
                         {
@@ -314,7 +314,7 @@ protected override void OnKeyDown(KeyEventArgs e)
         protected override void OnKeyUp(KeyEventArgs e)
         {
             // Handle Space only current focus control
-            if (e.Key == Key.Space && TopLevel.GetTopLevel(this)?.FocusManager?.GetFocusedElement() == this)
+            if (e.Key == Key.Space && IsFocused)
             {
                 if (ClickMode == ClickMode.Release)
                 {