From 0abb1d10ac981f13a13cc077bc2e3eafa9a007ec Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Mon, 17 Apr 2006 03:19:22 +0000 Subject: [PATCH] Back out checkins for bug 333829, for now at least. git-svn-id: svn://10.0.0.236/trunk@194496 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsGfxScrollFrame.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/mozilla/layout/generic/nsGfxScrollFrame.cpp b/mozilla/layout/generic/nsGfxScrollFrame.cpp index 834db08ad78..8b4b37d3c6f 100644 --- a/mozilla/layout/generic/nsGfxScrollFrame.cpp +++ b/mozilla/layout/generic/nsGfxScrollFrame.cpp @@ -2395,14 +2395,10 @@ nsGfxScrollFrameInner::LayoutScrollbars(nsBoxLayoutState& aState, NS_PRECONDITION(mVScrollbarBox->IsBoxFrame(), "Must be a box frame!"); nscoord curPosX, curPosY; scrollable->GetScrollPosition(curPosX, curPosY); - // The current position may have become invalid due to min/max changes. - curPosY = PR_MAX(curPosY, minY); - curPosY = PR_MIN(curPosY, maxY); // Scrollbars assume zero is the minimum position, so translate for them. + SetCoordAttribute(mVScrollbarBox, nsXULAtoms::curpos, curPosY - minY); SetScrollbarEnabled(mVScrollbarBox, maxY - minY); SetCoordAttribute(mVScrollbarBox, nsXULAtoms::maxpos, maxY - minY); - // Set curpos after maxpos since it could be clamped based on maxpos. - SetCoordAttribute(mVScrollbarBox, nsXULAtoms::curpos, curPosY - minY); SetCoordAttribute(mVScrollbarBox, nsXULAtoms::pageincrement, nscoord(aScrollArea.height - fontHeight)); SetCoordAttribute(mVScrollbarBox, nsXULAtoms::increment, fontHeight); @@ -2419,14 +2415,10 @@ nsGfxScrollFrameInner::LayoutScrollbars(nsBoxLayoutState& aState, NS_PRECONDITION(mHScrollbarBox->IsBoxFrame(), "Must be a box frame!"); nscoord curPosX, curPosY; scrollable->GetScrollPosition(curPosX, curPosY); - // The current position may have become invalid due to min/max changes. - curPosX = PR_MAX(curPosX, minX); - curPosX = PR_MIN(curPosX, maxX); // Scrollbars assume zero is the minimum position, so translate for them. + SetCoordAttribute(mHScrollbarBox, nsXULAtoms::curpos, curPosX - minX); SetScrollbarEnabled(mHScrollbarBox, maxX - minX); SetCoordAttribute(mHScrollbarBox, nsXULAtoms::maxpos, maxX - minX); - // Set curpos after maxpos since it could be clamped based on maxpos. - SetCoordAttribute(mHScrollbarBox, nsXULAtoms::curpos, curPosX - minX); SetCoordAttribute(mHScrollbarBox, nsXULAtoms::pageincrement, nscoord(float(aScrollArea.width)*0.8)); SetCoordAttribute(mHScrollbarBox, nsXULAtoms::increment, 10*mOnePixel);