Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 402843. Don't persistently store scroll positions in device pixels, it just gets out of sync and causes bugs during full zoom. r+sr=bzbarsky

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@239517 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
roc+%cs.cmu.edu
2007-11-16 01:45:21 +00:00
parent 92fc0c9f9c
commit 5fbbc7b502
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mozilla/view/src/nsScrollPortView.cpp
View File

@@ -81,7 +81,6 @@ nsScrollPortView::nsScrollPortView(nsViewManager* aViewManager)
: nsView(aViewManager)
{
mOffsetX = mOffsetY = 0;
mOffsetXpx = mOffsetYpx = 0;
nsCOMPtr<nsIDeviceContext> dev;
mViewManager->GetDeviceContext(*getter_AddRefs(dev));
mLineHeight = dev->AppUnitsPerInch() / 6; // 12 pt
@@ -617,12 +616,11 @@ NS_IMETHODIMP nsScrollPortView::ScrollToImpl(nscoord aX, nscoord aY, PRUint32 aU
return rv;
}
// convert aX and aY in pixels
nscoord aXpx = NSAppUnitsToIntPixels(aX, p2a);
nscoord aYpx = NSAppUnitsToIntPixels(aY, p2a);
PRInt32 xPixels = NSAppUnitsToIntPixels(aX, p2a);
PRInt32 yPixels = NSAppUnitsToIntPixels(aY, p2a);
aX = NSIntPixelsToAppUnits(aXpx, p2a);
aY = NSIntPixelsToAppUnits(aYpx, p2a);
aX = NSIntPixelsToAppUnits(xPixels, p2a);
aY = NSIntPixelsToAppUnits(yPixels, p2a);
// do nothing if the we aren't scrolling.
// this needs to be rechecked because of the clamping and
@@ -632,8 +630,8 @@ NS_IMETHODIMP nsScrollPortView::ScrollToImpl(nscoord aX, nscoord aY, PRUint32 aU
}
// figure out the diff by comparing old pos to new
dxPx = mOffsetXpx - aXpx;
dyPx = mOffsetYpx - aYpx;
dxPx = NSAppUnitsToIntPixels(mOffsetX, p2a) - xPixels;
dyPx = NSAppUnitsToIntPixels(mOffsetY, p2a) - yPixels;
// notify the listeners.
PRUint32 listenerCount;
@@ -658,11 +656,6 @@ NS_IMETHODIMP nsScrollPortView::ScrollToImpl(nscoord aX, nscoord aY, PRUint32 aU
// so don't update their positions
scrolledView->SetPositionIgnoringChildWidgets(-aX, -aY);
// store old position in pixels. We need to do this to make sure there is no
// round off errors. This could cause weird scrolling.
mOffsetXpx = aXpx;
mOffsetYpx = aYpx;
nsPoint twipsDelta(aX - mOffsetX, aY - mOffsetY);
// store the new position

1
mozilla/view/src/nsScrollPortView.h
View File

@@ -106,7 +106,6 @@ protected:
PRBool CannotBitBlt(nsView* aScrolledView);
nscoord mOffsetX, mOffsetY;
nscoord mOffsetXpx, mOffsetYpx;
PRUint32 mScrollProperties;
nscoord mLineHeight;
nsISupportsArray *mListeners;