From 9275e599090bb3a3428411ef8c8c4107f2624fa6 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 22 Dec 2021 21:36:48 -0500
Subject: [PATCH] Do not recalculate pointer popup position on parent moved

---
 src/Avalonia.Controls/Primitives/Popup.cs | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs
index ffab7f86d1..a47149a9e0 100644
--- a/src/Avalonia.Controls/Primitives/Popup.cs
+++ b/src/Avalonia.Controls/Primitives/Popup.cs
@@ -429,16 +429,20 @@ namespace Avalonia.Controls.Primitives
                     (x, handler) => x.LostFocus += handler,
                     (x, handler) => x.LostFocus -= handler).DisposeWith(handlerCleanup);
 
-                SubscribeToEventHandler<IWindowImpl, Action<PixelPoint>>(window.PlatformImpl, WindowPositionChanged,
-                    (x, handler) => x.PositionChanged += handler,
-                    (x, handler) => x.PositionChanged -= handler).DisposeWith(handlerCleanup);
-                    
-                if (placementTarget is Layoutable layoutTarget)
+                // Recalculate popup position on parent moved/resized, but not if placement was on pointer
+                if (PlacementMode != PlacementMode.Pointer)
                 {
-                    // If the placement target is moved, update the popup position
-                    SubscribeToEventHandler<Layoutable, EventHandler>(layoutTarget, PlacementTargetLayoutUpdated,
-                        (x, handler) => x.LayoutUpdated += handler,
-                        (x, handler) => x.LayoutUpdated -= handler).DisposeWith(handlerCleanup);
+                    SubscribeToEventHandler<IWindowImpl, Action<PixelPoint>>(window.PlatformImpl, WindowPositionChanged,
+                        (x, handler) => x.PositionChanged += handler,
+                        (x, handler) => x.PositionChanged -= handler).DisposeWith(handlerCleanup);
+
+                    if (placementTarget is Layoutable layoutTarget)
+                    {
+                        // If the placement target is moved, update the popup position
+                        SubscribeToEventHandler<Layoutable, EventHandler>(layoutTarget, PlacementTargetLayoutUpdated,
+                            (x, handler) => x.LayoutUpdated += handler,
+                            (x, handler) => x.LayoutUpdated -= handler).DisposeWith(handlerCleanup);
+                    }
                 }
             }
             else if (topLevel is PopupRoot parentPopupRoot)