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

Merge branch 'PopoverContentSize' of https://github.com/Dogild/cappuccino into Dogild-PopoverContentSize

Browse Source
This commit is contained in:
Antoine Mercadal
2014-04-30 17:03:50 -07:00
parent de4bc67159 9d694a1589
commit c19ed471ca
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPPopover.j
+1 -1
View File
@@ -150,7 +150,7 @@ var CPPopoverDelegate_popover_willShow_ = 1 << 0,
*/
- (void)setContentSize:(CGSize)aSize
{
[[_contentViewController view] setFrameSize:aSize];
[_popoverWindow updateFrameWithSize:aSize];
}
/*!
AppKit/_CPPopoverWindow.j
+15
View File
@@ -366,6 +366,21 @@ var _CPPopoverWindow_shouldClose_ = 1 << 4,
return CPBrowserStyleProperty('transition') && CPBrowserStyleProperty('transitionend');
}
/*!
@ignore
*/
- (void)updateFrameWithSize:(CGSize)aSize
{
var rect = CGRectMakeZero();
rect.size = aSize;
rect.origin = [[self contentView] frameOrigin];
[self setFrame:[self frameRectForContentRect:rect]];
var point = [self computeOriginFromRect:[_targetView bounds] ofView:_targetView preferredEdge:[_windowView preferredEdge]];
[self setFrameOrigin:point];
}
#pragma mark -
#pragma mark Actions