wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 681192. Part 5: Make various DOM scroll APIs --- scrollTop, scrollLeft, window.scrollTo, scrollBox.scrollTo, scrollBox.scrollToLine, scrollBox.scrollBy --- use an appropriate allowed scroll destination range. r=roc,r=matspal

Browse Source 
--HG--
extra : rebase_source : 83ee44530c67229686ec0dce3628da83e0e93438
This commit is contained in:
Oleg Romashin 2012-02-07 12:24:15 -08:00
parent 7ad2071db0
commit 01f49c7c7b
3 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
content/base/src/nsGenericElement.cpp
View File

@ -2142,7 +2142,10 @@ nsGenericElement::SetScrollTop(PRInt32 aScrollTop)
if (sf) {
nsPoint pt = sf->GetScrollPosition();
pt.y = nsPresContext::CSSPixelsToAppUnits(aScrollTop);
sf->ScrollTo(pt, nsIScrollableFrame::INSTANT);
nscoord halfPixel = nsPresContext::CSSPixelsToAppUnits(0.5f);
// Don't allow pt.y + halfPixel since that would round up to the next CSS pixel.
nsRect range(pt.x, pt.y - halfPixel, 0, halfPixel*2 - 1);
sf->ScrollTo(pt, nsIScrollableFrame::INSTANT, &range);
}
return NS_OK;
}
@ -2172,7 +2175,10 @@ nsGenericElement::SetScrollLeft(PRInt32 aScrollLeft)
if (sf) {
nsPoint pt = sf->GetScrollPosition();
pt.x = nsPresContext::CSSPixelsToAppUnits(aScrollLeft);
sf->ScrollTo(pt, nsIScrollableFrame::INSTANT);
nscoord halfPixel = nsPresContext::CSSPixelsToAppUnits(0.5f);
// Don't allow pt.x + halfPixel since that would round up to the next CSS pixel.
nsRect range(pt.x - halfPixel, pt.y, halfPixel*2 - 1, 0);
sf->ScrollTo(pt, nsIScrollableFrame::INSTANT, &range);
}
return NS_OK;
}

9
dom/base/nsGlobalWindow.cpp
View File

@ -5329,9 +5329,12 @@ nsGlobalWindow::ScrollTo(PRInt32 aXScroll, PRInt32 aYScroll)
if (aYScroll > maxpx) {
aYScroll = maxpx;
}
sf->ScrollTo(nsPoint(nsPresContext::CSSPixelsToAppUnits(aXScroll),
nsPresContext::CSSPixelsToAppUnits(aYScroll)),
nsIScrollableFrame::INSTANT);
nsPoint pt(nsPresContext::CSSPixelsToAppUnits(aXScroll),
nsPresContext::CSSPixelsToAppUnits(aYScroll));
nscoord halfPixel = nsPresContext::CSSPixelsToAppUnits(0.5f);
// Don't allow pt.x/y + halfPixel since that would round up to the next CSS pixel.
nsRect range(pt.x - halfPixel, pt.y - halfPixel, halfPixel*2 - 1, halfPixel*2 - 1);
sf->ScrollTo(pt, nsIScrollableFrame::INSTANT, &range);
}
return NS_OK;

38
layout/xul/base/src/nsScrollBoxObject.cpp
View File

@ -91,9 +91,12 @@ NS_IMETHODIMP nsScrollBoxObject::ScrollTo(PRInt32 x, PRInt32 y)
if (!sf)
return NS_ERROR_FAILURE;
sf->ScrollTo(nsPoint(nsPresContext::CSSPixelsToAppUnits(x),
nsPresContext::CSSPixelsToAppUnits(y)),
nsIScrollableFrame::INSTANT);
nsPoint pt(nsPresContext::CSSPixelsToAppUnits(x),
nsPresContext::CSSPixelsToAppUnits(y));
nscoord halfPixel = nsPresContext::CSSPixelsToAppUnits(0.5f);
// Don't allow pt.x/y + halfPixel since that would round up to the next CSS pixel.
nsRect range(pt.x - halfPixel, pt.y - halfPixel, halfPixel*2 - 1, halfPixel*2 - 1);
sf->ScrollTo(pt, nsIScrollableFrame::INSTANT, &range);
return NS_OK;
}
@ -225,16 +228,29 @@ NS_IMETHODIMP nsScrollBoxObject::ScrollByIndex(PRInt32 dindexes)
}
}
if (horiz)
nscoord csspixel = nsPresContext::CSSPixelsToAppUnits(1);
if (horiz) {
// In the left-to-right case we scroll so that the left edge of the
// selected child is scrolled to the left edge of the scrollbox.
// In the right-to-left case we scroll so that the right edge of the
// selected child is scrolled to the right edge of the scrollbox.
sf->ScrollTo(nsPoint(isLTR ? rect.x : rect.x + rect.width - frameWidth,
cp.y),
nsIScrollableFrame::INSTANT);
else
sf->ScrollTo(nsPoint(cp.x, rect.y), nsIScrollableFrame::INSTANT);
nsPoint pt(isLTR ? rect.x : rect.x + rect.width - frameWidth,
cp.y);
// Use a destination range that ensures the left edge (or right edge,
// for RTL) will indeed be visible. Also ensure that the top edge
// is visible.
nsRect range(pt.x, pt.y, csspixel, 0);
if (isLTR) {
range.x -= csspixel;
}
sf->ScrollTo(pt, nsIScrollableFrame::INSTANT, &range);
} else {
// Use a destination range that ensures the top edge will be visible.
nsRect range(cp.x, rect.y - csspixel, 0, csspixel);
sf->ScrollTo(nsPoint(cp.x, rect.y), nsIScrollableFrame::INSTANT, &range);
}
return NS_OK;
}
@ -247,7 +263,9 @@ NS_IMETHODIMP nsScrollBoxObject::ScrollToLine(PRInt32 line)
return NS_ERROR_FAILURE;
nscoord y = sf->GetLineScrollAmount().height * line;
sf->ScrollTo(nsPoint(0, y), nsIScrollableFrame::INSTANT);
nsRect range(0, y - nsPresContext::CSSPixelsToAppUnits(1),
0, nsPresContext::CSSPixelsToAppUnits(1));
sf->ScrollTo(nsPoint(0, y), nsIScrollableFrame::INSTANT, &range);
return NS_OK;
}