From f79edc7bfb59aed689d856adc1da367a64e57c63 Mon Sep 17 00:00:00 2001 From: Klaas Pieter Annema Date: Tue, 14 Sep 2010 11:12:29 +0200 Subject: [PATCH] fix scroller being offset 1 pixel when headerview had the same height as corner view --- AppKit/CPScrollView.j | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/AppKit/CPScrollView.j b/AppKit/CPScrollView.j index 2fb5ff510..9aad1b8fd 100644 --- a/AppKit/CPScrollView.j +++ b/AppKit/CPScrollView.j @@ -314,8 +314,10 @@ if (shouldShowVerticalScroller) { - var verticalScrollerY = MAX(_CGRectGetMaxY([self _cornerViewFrame]), headerClipViewHeight + 1.0), - verticalScrollerHeight = _CGRectGetMaxY(contentFrame) - verticalScrollerY; + var verticalScrollerY = + MAX(_CGRectGetMinY(contentFrame), MAX(_CGRectGetMaxY([self _cornerViewFrame]), _CGRectGetMaxY(headerClipViewFrame))); + + var verticalScrollerHeight = _CGRectGetMaxY(contentFrame) - verticalScrollerY; [_verticalScroller setFloatValue:(difference.height <= 0.0) ? 0.0 : scrollPoint.y / difference.height]; [_verticalScroller setKnobProportion:_CGRectGetHeight(contentFrame) / _CGRectGetHeight(documentFrame)];