colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-25 13:07:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

make _targetRect an ivar

Browse Source
This commit is contained in:
daboe01
2015-01-02 19:35:09 +01:00
parent 5995b42872
commit 00ebc265d8
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/_CPPopoverWindow.j
+10 -1
View File
@@ -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];