Browse Source

fix: Address review

pull/9588/head
Giuseppe Lippolis 3 years ago
parent
commit
6b1160b76d
  1. 4
      src/Avalonia.Base/Input/AccessKeyHandler.cs
  2. 4
      src/Avalonia.Controls/MenuItemAccessKeyHandler.cs

4
src/Avalonia.Base/Input/AccessKeyHandler.cs

@ -183,8 +183,8 @@ namespace Avalonia.Input
// find all controls who have registered that access key. // find all controls who have registered that access key.
var text = e.Key.ToString(); var text = e.Key.ToString();
var matches = _registered var matches = _registered
.Where(x => x.Element.IsEffectivelyVisible .Where(x => string.Equals(x.AccessKey, text, StringComparison.OrdinalIgnoreCase)
&& string.Equals(x.AccessKey , text, StringComparison.OrdinalIgnoreCase) ) && x.Element.IsEffectivelyVisible)
.Select(x => x.Element); .Select(x => x.Element);
// If the menu is open, only match controls in the menu's visual tree. // If the menu is open, only match controls in the menu's visual tree.

4
src/Avalonia.Controls/MenuItemAccessKeyHandler.cs

@ -90,8 +90,8 @@ namespace Avalonia.Controls
{ {
var text = e.Text; var text = e.Text;
var focus = _registered var focus = _registered
.FirstOrDefault(x => x.Element.IsEffectivelyVisible .FirstOrDefault(x => string.Equals(x.AccessKey, text, StringComparison.OrdinalIgnoreCase)
&& string.Equals(x.AccessKey, text, StringComparison.OrdinalIgnoreCase)).Element; && x.Element.IsEffectivelyVisible).Element;
focus?.RaiseEvent(new RoutedEventArgs(AccessKeyHandler.AccessKeyPressedEvent)); focus?.RaiseEvent(new RoutedEventArgs(AccessKeyHandler.AccessKeyPressedEvent));

Loading…
Cancel
Save