From 6b1160b76d3962b6e8f3e2ea41de3d1e36cbfc1c Mon Sep 17 00:00:00 2001 From: Giuseppe Lippolis Date: Sat, 3 Dec 2022 12:44:40 +0100 Subject: [PATCH] fix: Address review --- src/Avalonia.Base/Input/AccessKeyHandler.cs | 4 ++-- src/Avalonia.Controls/MenuItemAccessKeyHandler.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Avalonia.Base/Input/AccessKeyHandler.cs b/src/Avalonia.Base/Input/AccessKeyHandler.cs index 239fb53a9f..59c66ed505 100644 --- a/src/Avalonia.Base/Input/AccessKeyHandler.cs +++ b/src/Avalonia.Base/Input/AccessKeyHandler.cs @@ -183,8 +183,8 @@ namespace Avalonia.Input // find all controls who have registered that access key. var text = e.Key.ToString(); var matches = _registered - .Where(x => x.Element.IsEffectivelyVisible - && string.Equals(x.AccessKey , text, StringComparison.OrdinalIgnoreCase) ) + .Where(x => string.Equals(x.AccessKey, text, StringComparison.OrdinalIgnoreCase) + && x.Element.IsEffectivelyVisible) .Select(x => x.Element); // If the menu is open, only match controls in the menu's visual tree. diff --git a/src/Avalonia.Controls/MenuItemAccessKeyHandler.cs b/src/Avalonia.Controls/MenuItemAccessKeyHandler.cs index 7e36633c11..381f1799d4 100644 --- a/src/Avalonia.Controls/MenuItemAccessKeyHandler.cs +++ b/src/Avalonia.Controls/MenuItemAccessKeyHandler.cs @@ -90,8 +90,8 @@ namespace Avalonia.Controls { var text = e.Text; var focus = _registered - .FirstOrDefault(x => x.Element.IsEffectivelyVisible - && string.Equals(x.AccessKey, text, StringComparison.OrdinalIgnoreCase)).Element; + .FirstOrDefault(x => string.Equals(x.AccessKey, text, StringComparison.OrdinalIgnoreCase) + && x.Element.IsEffectivelyVisible).Element; focus?.RaiseEvent(new RoutedEventArgs(AccessKeyHandler.AccessKeyPressedEvent));