Browse Source
Merge branch 'master' into fixes/application_some_nullable_warnings
pull/6140/head
Max Katz
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
3 additions and
3 deletions
-
src/Avalonia.Controls/MenuItem.cs
|
|
|
@ -36,7 +36,7 @@ namespace Avalonia.Controls |
|
|
|
/// <summary>
|
|
|
|
/// Defines the <see cref="HotKey"/> property.
|
|
|
|
/// </summary>
|
|
|
|
public static readonly StyledProperty<KeyGesture> HotKeyProperty = |
|
|
|
public static readonly StyledProperty<KeyGesture?> HotKeyProperty = |
|
|
|
HotKeyManager.HotKeyProperty.AddOwner<MenuItem>(); |
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
@ -108,7 +108,7 @@ namespace Avalonia.Controls |
|
|
|
private ICommand? _command; |
|
|
|
private bool _commandCanExecute = true; |
|
|
|
private Popup? _popup; |
|
|
|
private KeyGesture _hotkey; |
|
|
|
private KeyGesture? _hotkey; |
|
|
|
private bool _isEmbeddedInMenu; |
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
@ -214,7 +214,7 @@ namespace Avalonia.Controls |
|
|
|
/// <summary>
|
|
|
|
/// Gets or sets an <see cref="KeyGesture"/> associated with this control
|
|
|
|
/// </summary>
|
|
|
|
public KeyGesture HotKey |
|
|
|
public KeyGesture? HotKey |
|
|
|
{ |
|
|
|
get { return GetValue(HotKeyProperty); } |
|
|
|
set { SetValue(HotKeyProperty, value); } |
|
|
|
|
