Skip to content

Commit

Permalink
Merge pull request #7436 from AvaloniaUI/ensure-flyout-closed
Browse files Browse the repository at this point in the history
Ensure menu children are closed on menu flyout presenter detached
  • Loading branch information
danwalmsley committed Jan 26, 2022
1 parent 4652264 commit ebc00d6
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,18 @@ protected override IItemContainerGenerator CreateItemContainerGenerator()
{
return new MenuItemContainerGenerator(this);
}

protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
{
base.OnDetachedFromVisualTree(e);

foreach (var i in LogicalChildren)
{
if (i is MenuItem menuItem)
{
menuItem.IsSubMenuOpen = false;
}
}
}
}
}

0 comments on commit ebc00d6

Please sign in to comment.