fix: Address review

AvaloniaUI · Oct 5, 2024 · dcccfe7 · dcccfe7
1 parent b711f77
commit dcccfe7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/src/Avalonia.Base/Input/AccessKeyHandler.cs b/src/Avalonia.Base/Input/AccessKeyHandler.cs
@@ -181,13 +181,7 @@ protected virtual void OnKeyDown(object? sender, KeyEventArgs e)
                 // If any other key is pressed with the Alt key held down, or the main menu is open,
                 // find all controls who have registered that access key.
 
-                /// Instead of <see cref="Platform.KeyGestureFormatInfo.FormatKey"/> 
-                /// can be use <see cref="KeyEventArgs.KeySymbol"/> 
-                /// but <see cref="Platform.KeyGestureFormatInfo.FormatKey"/> 
-                /// it might allow the developer to extend the behavior in the future.
-                var text =
-                    Platform.KeyGestureFormatInfo.GetInstance(System.Globalization.CultureInfo.CurrentUICulture)
-                        .FormatKey(e.Key);
+                var text = e.KeySymbol;
                 var matches = _registered
                     .Where(x => string.Equals(x.AccessKey, text, StringComparison.OrdinalIgnoreCase)
                         && x.Element.IsEffectivelyVisible
@@ -231,7 +225,7 @@ protected virtual void OnPreviewKeyUp(object? sender, KeyEventArgs e)
                     {
                         MainMenu.Open();
                     }
-                    if (MainMenu is null || !MainMenu.IsVisible)
+                    if (MainMenu is null)
                     {
                         _owner!.ShowAccessKeys = _showingAccessKeys = false;
                     }

diff --git a/src/Avalonia.Base/Input/IMainMenu.cs b/src/Avalonia.Base/Input/IMainMenu.cs
@@ -23,11 +23,6 @@ internal interface IMainMenu
         /// </summary>
         void Open();
 
-        /// <summary>
-        /// Indicating whether the menu is Visible
-        /// </summary>
-        bool IsVisible { get; }
-
         /// <summary>
         /// Occurs when the main menu closes.
         /// </summary>