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 3: Make nsListControlFrame::ScrollToFrame use ScrollFrameRectIntoView. r=roc

Browse Source 
--HG--
extra : rebase_source : c9e0fbbd024e9fe15ca0e2dc0bad1ef90aa51edd
This commit is contained in:
Oleg Romashin 2012-02-07 12:21:13 -08:00
parent 0f88c6891c
commit 936b7eea85
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
layout/forms/nsListControlFrame.cpp
View File

@ -2210,25 +2210,12 @@ nsListControlFrame::ScrollToFrame(nsIContent* aOptElement)
// otherwise we find the content's frame and scroll to it
nsIFrame *childFrame = aOptElement->GetPrimaryFrame();
if (childFrame) {
nsPoint pt = GetScrollPosition();
// get the scroll port rect relative to the scrolled frame
nsRect rect = GetScrollPortRect() + pt;
// get the option's rect relative to the scrolled frame
nsRect fRect(childFrame->GetOffsetTo(GetScrolledFrame()),
childFrame->GetSize());
// See if the selected frame (fRect) is inside the scrollport
// area (rect). Check only the vertical dimension. Don't
// scroll just because there's horizontal overflow.
if (!(rect.y <= fRect.y && fRect.YMost() <= rect.YMost())) {
// figure out which direction we are going
if (fRect.YMost() > rect.YMost()) {
pt.y = fRect.y - (rect.height - fRect.height);
} else {
pt.y = fRect.y;
}
ScrollTo(nsPoint(fRect.x, pt.y), nsIScrollableFrame::INSTANT);
}
PresContext()->PresShell()->
ScrollFrameRectIntoView(childFrame,
nsRect(nsPoint(0, 0), childFrame->GetSize()),
nsIPresShell::ScrollAxis(), nsIPresShell::ScrollAxis(),
nsIPresShell::SCROLL_OVERFLOW_HIDDEN |
nsIPresShell::SCROLL_FIRST_ANCESTOR_ONLY);
}
return NS_OK;
}