Merge branch 'master' into linux-shutdown-prevention-xsmp

5 years ago · 3cc334a4da
1 changed files with 1 additions and 1 deletions
--- a/src/Avalonia.Controls/MenuItem.cs
+++ b/src/Avalonia.Controls/MenuItem.cs
@ -387,7 +387,7 @@ namespace Avalonia.Controls
                parent = parent.Parent;
            }

-            _isEmbeddedInMenu = parent is IMenu;
+            _isEmbeddedInMenu = parent.FindLogicalAncestorOfType<IMenu>(true) != null;
        }

        protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)