From fdb6cc29f867f8407d08b8d70b0f07e36b236b31 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sat, 25 Sep 2021 09:05:30 -0400
Subject: [PATCH] Merge pull request #6638 from amwx/FlyoutOpeningFix

FlyoutBase create presenter before calling Opening event
---
 src/Avalonia.Controls/Flyouts/FlyoutBase.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
index 230b4954fe..4b903d056c 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
@@ -215,11 +215,6 @@ namespace Avalonia.Controls.Primitives
                 }
             }
 
-            if (CancelOpening())
-            {
-                return false;
-            }
-
             if (Popup.Parent != null && Popup.Parent != placementTarget)
             {
                 ((ISetLogicalParent)Popup).SetParent(null);
@@ -236,6 +231,11 @@ namespace Avalonia.Controls.Primitives
                 Popup.Child = CreatePresenter();
             }
 
+            if (CancelOpening())
+            {
+                return false;
+            }
+
             PositionPopup(showAtPointer);
             IsOpen = Popup.IsOpen = true;
             OnOpened();