From 6fd1b09b01d97db8d186f162998ea07fc5dc43f3 Mon Sep 17 00:00:00 2001 From: "roc+%cs.cmu.edu" Date: Tue, 2 Aug 2005 20:19:34 +0000 Subject: [PATCH] Bug 295673. Fix up GetActualScrollbarSizes so that padding doesn't confuse it. r+sr=dbaron, a=bsmedberg git-svn-id: svn://10.0.0.236/trunk@177011 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsGfxScrollFrame.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mozilla/layout/generic/nsGfxScrollFrame.cpp b/mozilla/layout/generic/nsGfxScrollFrame.cpp index 57cc346d13a..c927605046e 100644 --- a/mozilla/layout/generic/nsGfxScrollFrame.cpp +++ b/mozilla/layout/generic/nsGfxScrollFrame.cpp @@ -2443,13 +2443,15 @@ nsGfxScrollFrameInner::GetScrolledSize() const nsMargin nsGfxScrollFrameInner::GetActualScrollbarSizes() const { - nsRect contentRect; - mOuter->GetClientRect(contentRect); + nsMargin border; + mOuter->GetBorder(border); + nsRect r = mOuter->GetRect(); + r.Deflate(border); nsRect scrollArea = mScrollableView->View()->GetBounds(); - return nsMargin(scrollArea.x - contentRect.x, scrollArea.y - contentRect.y, - contentRect.XMost() - scrollArea.XMost(), - contentRect.YMost() - scrollArea.YMost()); + return nsMargin(scrollArea.x - r.x, scrollArea.y - r.y, + r.XMost() - scrollArea.XMost(), + r.YMost() - scrollArea.YMost()); } void