From 00ebc265d87f2d2cd778c31709d325ebdf174db3 Mon Sep 17 00:00:00 2001
From: daboe01 <daboe01@googlemail.com>
Date: Fri, 2 Jan 2015 19:35:09 +0100
Subject: [PATCH] make _targetRect an ivar

---
 AppKit/_CPPopoverWindow.j | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/AppKit/_CPPopoverWindow.j b/AppKit/_CPPopoverWindow.j
index 19bfa82ac..d915b7bd5 100644
--- a/AppKit/_CPPopoverWindow.j
+++ b/AppKit/_CPPopoverWindow.j
@@ -64,6 +64,7 @@ var _CPPopoverWindow_shouldClose_    = 1 << 4,
     BOOL            _isObservingFrame;
     BOOL            _shouldPerformAnimation;
     CPInteger       _implementedDelegateMethods;
+    CGRect          _targetRect;
     CPWindow        _targetWindow;
     JSObject        _orderOutTransitionFunction;
     JSObject        _transitionCompleteFunction;
@@ -206,7 +207,7 @@ var _CPPopoverWindow_shouldClose_    = 1 << 4,
         if (![_targetView window])
             return;
 
-        var point = [self computeOriginFromRect:[_targetView bounds] ofView:_targetView preferredEdge:[_windowView preferredEdge]];
+        var point = [self computeOriginFromRect:_targetRect ofView:_targetView preferredEdge:[_windowView preferredEdge]];
         [self setFrameOrigin:point];
     }
 }
@@ -369,6 +370,13 @@ var _CPPopoverWindow_shouldClose_    = 1 << 4,
         _targetView = positioningView;
     }
 
+    if (positioningView !== _targetView)
+    {
+        [[_targetView window] removeChildWindow:self];
+        [self _removeFrameObserver];
+        _targetView = positioningView;
+    }
+
     [self makeKeyAndOrderFront:nil];
 
     /*
@@ -382,6 +390,7 @@ var _CPPopoverWindow_shouldClose_    = 1 << 4,
         [[_targetView window] addChildWindow:self ordered:CPWindowAbove];
 
     _targetWindow = targetWindow;
+    _targetRect = aRect;
 
     if (!wasVisible)
         [self _trapNextMouseDown];