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 534561. When scrolling with SW_SCROLLCHILDREN, invalidate any affected window that is not wholly inside the destination *or* source area, and do the invalidation after we've scrolled and moved the window. r=jmathies

Browse Source
This commit is contained in:
Robert O'Callahan 2009-12-17 14:34:39 +13:00
parent 91fd0fb306
commit 7b122fa3ff
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
widget/src/windows/nsWindow.cpp
View File

@ -2341,21 +2341,6 @@ nsWindow::Scroll(const nsIntPoint& aDelta,
}
if (flags & SW_SCROLLCHILDREN) {
for (PRUint32 i = 0; i < aConfigurations.Length(); ++i) {
const Configuration& configuration = aConfigurations[i];
nsWindow* w = static_cast<nsWindow*>(configuration.mChild);
// Widgets that will be scrolled by SW_SCROLLCHILDREN but which
// will be partly visible outside the scroll area after scrolling
// must be invalidated, because SW_SCROLLCHILDREN doesn't
// update parts of widgets outside the area it scrolled, even
// if it moved them.
if (w->mBounds.Intersects(affectedRect) &&
!ClipRegionContainedInRect(configuration.mClipRegion,
affectedRect - (w->mBounds.TopLeft() + aDelta))) {
w->Invalidate(PR_FALSE);
}
}
// ScrollWindowEx will send WM_MOVE to each moved window to tell it
// its new position. Unfortunately those messages don't reach our
// WM_MOVE handler for some plugins, so we have to update their
@ -2390,6 +2375,25 @@ nsWindow::Scroll(const nsIntPoint& aDelta,
::SetRectRgn(destRgn, destRect.x, destRect.y, destRect.XMost(), destRect.YMost());
::CombineRgn(updateRgn, updateRgn, destRgn, RGN_AND);
if (flags & SW_SCROLLCHILDREN) {
for (nsWindow* w = static_cast<nsWindow*>(GetFirstChild()); w;
w = static_cast<nsWindow*>(w->GetNextSibling())) {
if ((w->mBounds - aDelta).Intersects(affectedRect)) {
// Widgets that have been scrolled by SW_SCROLLCHILDREN but which
// were, or are, partly outside the scroll area must be invalidated
// because SW_SCROLLCHILDREN doesn't update parts of widgets outside
// the area it scrolled, even if it moved them.
nsAutoTArray<nsIntRect,1> clipRegion;
w->GetWindowClipRegion(&clipRegion);
if (!ClipRegionContainedInRect(clipRegion,
destRect - w->mBounds.TopLeft()) ||
!ClipRegionContainedInRect(clipRegion,
destRect - (w->mBounds.TopLeft() - aDelta))) {
::SetRectRgn(destRgn, w->mBounds.x, w->mBounds.y, w->mBounds.XMost(), w->mBounds.YMost());
::CombineRgn(updateRgn, updateRgn, destRgn, RGN_OR);
}
}
}
InvalidateRgnInWindowSubtree(mWnd, updateRgn, destRgn);
} else {
::InvalidateRgn(mWnd, updateRgn, FALSE);