colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-11-14 18:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for scrollviews being drawn below window resize indicator.

Browse Source
This commit is contained in:
luddep authored and Ross Boucher committed 2010-03-02 11:44:25 -08:00
1 parent f7c46855b8
commit 18a0deb678
1 file changed
+16 -3
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPScrollView.j
+16 -3
View File
@@ -229,6 +229,19 @@
if (shouldShowHorizontalScroller)
contentFrame.size.height -= horizontalScrollerHeight;
var _window = [self window],
forceCornerSpace = NO;
if (_window && [_window contentView])
{
var windowIsResizable = !!(([_window styleMask] & CPResizableWindowMask) || ([_window styleMask] & CPBorderlessBridgeWindowMask)),
relativeFrame = [self convertRect:[[_window contentView] frame] fromView:nil],
maxPoint = CGPointMake(CGRectGetMaxX([self bounds]), CGRectGetMaxY([self bounds])),
isInWindowCorner = CGRectGetMaxX(relativeFrame) >= maxPoint.x && CGRectGetMaxY(relativeFrame) >= maxPoint.y;
forceCornerSpace = windowIsResizable && isInWindowCorner;
}
var scrollPoint = [_contentView bounds].origin,
wasShowingVerticalScroller = ![_verticalScroller isHidden],
wasShowingHorizontalScroller = ![_horizontalScroller isHidden];
@@ -238,7 +251,7 @@
var verticalScrollerY = MAX(_CGRectGetHeight([self _cornerViewFrame]), headerClipViewHeight),
verticalScrollerHeight = _CGRectGetHeight([self bounds]) - verticalScrollerY;
if (shouldShowHorizontalScroller)
if (forceCornerSpace || shouldShowHorizontalScroller)
verticalScrollerHeight -= horizontalScrollerHeight;
[_verticalScroller setFloatValue:(difference.height <= 0.0) ? 0.0 : scrollPoint.y / difference.height];
@@ -255,7 +268,7 @@
{
[_horizontalScroller setFloatValue:(difference.width <= 0.0) ? 0.0 : scrollPoint.x / difference.width];
[_horizontalScroller setKnobProportion:_CGRectGetWidth(contentFrame) / _CGRectGetWidth(documentFrame)];
[_horizontalScroller setFrame:_CGRectMake(0.0, _CGRectGetMaxY(contentFrame), _CGRectGetWidth(contentFrame), horizontalScrollerHeight)];
[_horizontalScroller setFrame:_CGRectMake(0.0, _CGRectGetMaxY(contentFrame), _CGRectGetWidth(contentFrame) - ((!shouldShowVerticalScroller && forceCornerSpace) ? verticalScrollerWidth : 0), horizontalScrollerHeight)];
}
else if (wasShowingHorizontalScroller)
{
@@ -788,4 +801,4 @@ var CPScrollViewContentViewKey = "CPScrollViewContentView",
[aCoder encodeObject:_cornerView forKey:CPScrollViewCornerViewKey];
}
@end
@end