fix: fix menu root find in popup.

inquick · Jun 23, 2023 · b69f118 · b69f118
1 parent 12da057
commit b69f118
Showing 1 changed file with 21 additions and 1 deletion.
diff --git a/src/Ursa/Controls/Navigation/NavigationMenuItem.cs b/src/Ursa/Controls/Navigation/NavigationMenuItem.cs
@@ -82,7 +82,13 @@ private void OnIsClosedChanged(AvaloniaPropertyChangedEventArgs args)
     protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
     {
         base.OnAttachedToVisualTree(e);
-        _rootMenu = this.FindAncestorOfType<NavigationMenu>();
+
+    }
+
+    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+    {
+        base.OnApplyTemplate(e);
+        GetRootMenu();
         if (ItemTemplate == null && _rootMenu?.ItemTemplate != null)
         {
             SetCurrentValue(ItemTemplateProperty, _rootMenu.ItemTemplate);
@@ -98,6 +104,20 @@ protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         Level = CalculateDistanceFromLogicalParent<NavigationMenu>(this) - 1;
     }
 
+    private void GetRootMenu()
+    {
+        _rootMenu = this.FindAncestorOfType<NavigationMenu>();
+        if (_rootMenu is null)
+        {
+            var popupRoot = TopLevel.GetTopLevel(this) as PopupRoot;
+            if (popupRoot?.Parent is Popup popup)
+            {
+                Control? c = popup.PlacementTarget;
+                _rootMenu = c.FindAncestorOfType<NavigationMenu>();
+            }
+        }
+    }
+
     protected override void OnPointerPressed(PointerPressedEventArgs e)
     {
         base.OnPointerPressed(e);