colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-11 21:27:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jake' into menus

Browse Source
This commit is contained in:
Francisco Ryan Tolmasky I
2009-12-03 19:25:38 -08:00
parent 06b64c6a87 44d6139db2
commit a64030ad93
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPWebView.j
+3 -2
View File
@@ -150,8 +150,10 @@ CPWebViewScrollNative = 2;
_frameView = [[CPView alloc] initWithFrame:[self bounds]];
[_frameView setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
_scrollView = [[CPScrollView alloc] initWithFrame:[self bounds]];
[_scrollView setAutohidesScrollers:YES];
[_scrollView setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
[_scrollView setDocumentView:_frameView];
@@ -166,7 +168,6 @@ CPWebViewScrollNative = 2;
- (void)setFrameSize:(CPSize)aSize
{
[super setFrameSize:aSize];
[self _resizeWebFrame];
}
@@ -180,7 +181,7 @@ CPWebViewScrollNative = 2;
}
else
{
[_frameView setFrameSize:[_scrollView bounds].size];
[_frameView setFrameSize:[_scrollView contentSize]];
// try to get the document size so we can correctly set the frame
var win = null;