mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-13 21:35:39 +00:00
merge m-c to fx-team
This commit is contained in:
commit
3b3f03f5ef
@ -3233,7 +3233,8 @@ nsGfxScrollFrameInner::ReflowFinished()
|
||||
nsPoint scrollPos = GetScrollPosition();
|
||||
// XXX shouldn't we use GetPageScrollAmount/GetLineScrollAmount here?
|
||||
if (vScroll) {
|
||||
nscoord fontHeight = GetLineScrollAmount().height;
|
||||
const double kScrollMultiplier = 3;
|
||||
nscoord fontHeight = GetLineScrollAmount().height * kScrollMultiplier;
|
||||
// We normally use (scrollArea.height - fontHeight) for height
|
||||
// of page scrolling. However, it is too small when
|
||||
// fontHeight is very large. (If fontHeight is larger than
|
||||
@ -3243,7 +3244,7 @@ nsGfxScrollFrameInner::ReflowFinished()
|
||||
nscoord pageincrement = nscoord(mScrollPort.height - fontHeight);
|
||||
nscoord pageincrementMin = nscoord(float(mScrollPort.height) * 0.8);
|
||||
FinishReflowForScrollbar(vScroll, minY, maxY, scrollPos.y,
|
||||
NS_MAX(pageincrement,pageincrementMin),
|
||||
NS_MAX(pageincrement, pageincrementMin),
|
||||
fontHeight);
|
||||
}
|
||||
if (hScroll) {
|
||||
|
Loading…
Reference in New Issue
Block a user