Browse Source
Merge pull request #4355 from Gillibald/fixes/FluentSubMenu
Attempt to fix shared size group for fluent sub menu
pull/4358/head
danwalmsley
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
1 additions and
7 deletions
-
src/Avalonia.Controls/MenuItem.cs
|
|
|
@ -97,7 +97,6 @@ namespace Avalonia.Controls |
|
|
|
private ICommand _command; |
|
|
|
private bool _commandCanExecute = true; |
|
|
|
private Popup _popup; |
|
|
|
private IDisposable _gridHack; |
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// Initializes static members of the <see cref="MenuItem"/> class.
|
|
|
|
@ -323,9 +322,6 @@ namespace Avalonia.Controls |
|
|
|
{ |
|
|
|
Command.CanExecuteChanged -= CanExecuteChanged; |
|
|
|
} |
|
|
|
|
|
|
|
_gridHack?.Dispose(); |
|
|
|
_gridHack = null; |
|
|
|
} |
|
|
|
|
|
|
|
protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e) |
|
|
|
@ -345,9 +341,7 @@ namespace Avalonia.Controls |
|
|
|
// the WPF codebase:
|
|
|
|
//
|
|
|
|
// https://github.com/dotnet/wpf/blob/89537909bdf36bc918e88b37751add46a8980bb0/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/MenuItem.cs#L2126-L2141
|
|
|
|
_gridHack = Bind( |
|
|
|
DefinitionBase.PrivateSharedSizeScopeProperty, |
|
|
|
parent.GetBindingObservable(DefinitionBase.PrivateSharedSizeScopeProperty)); |
|
|
|
SetValue(DefinitionBase.PrivateSharedSizeScopeProperty, parent.GetValue(DefinitionBase.PrivateSharedSizeScopeProperty)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|