Merge pull request #6638 from amwx/FlyoutOpeningFix

FlyoutBase create presenter before calling Opening event
AvaloniaUI · Sep 29, 2021 · fdb6cc2 · fdb6cc2
1 parent 3ca9fab
commit fdb6cc2
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
@@ -215,11 +215,6 @@ protected virtual bool ShowAtCore(Control placementTarget, bool showAtPointer =
                 }
             }
 
-            if (CancelOpening())
-            {
-                return false;
-            }
-
             if (Popup.Parent != null && Popup.Parent != placementTarget)
             {
                 ((ISetLogicalParent)Popup).SetParent(null);
@@ -236,6 +231,11 @@ protected virtual bool ShowAtCore(Control placementTarget, bool showAtPointer =
                 Popup.Child = CreatePresenter();
             }
 
+            if (CancelOpening())
+            {
+                return false;
+            }
+
             PositionPopup(showAtPointer);
             IsOpen = Popup.IsOpen = true;
             OnOpened();