Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 11:26:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 591558: Don't consider child windows in opaque area. r=roc a=blocking-beta5

Browse Source
This commit is contained in:
Bas Schouten 2010-08-28 07:51:17 +00:00
parent 53a5cbd2d9
commit 6cc6fdf26b
1 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2441,20 +2441,6 @@ void nsWindow::SetTransparencyMode(nsTransparencyMode aMode)
GetTopLevelWindow(PR_TRUE)->SetWindowTranslucencyInner(aMode);
}
namespace {
BOOL CALLBACK AddClientAreaToRegion(HWND hWnd, LPARAM lParam) {
nsIntRegion *region = reinterpret_cast<nsIntRegion*>(lParam);
RECT clientRect;
::GetWindowRect(hWnd, &clientRect);
nsIntRect clientArea(clientRect.left, clientRect.top,
clientRect.right - clientRect.left,
clientRect.bottom - clientRect.top);
region->Or(*region, clientArea);
return TRUE;
}
}
void nsWindow::UpdatePossiblyTransparentRegion(const nsIntRegion &aDirtyRegion,
const nsIntRegion &aPossiblyTransparentRegion) {
#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
@ -2470,24 +2456,10 @@ void nsWindow::UpdatePossiblyTransparentRegion(const nsIntRegion &aDirtyRegion,
mPossiblyTransparentRegion.Sub(mPossiblyTransparentRegion, aDirtyRegion);
mPossiblyTransparentRegion.Or(mPossiblyTransparentRegion, aPossiblyTransparentRegion);
nsIntRegion childWindowRegion;
::EnumChildWindows(mWnd, AddClientAreaToRegion, reinterpret_cast<LPARAM>(&childWindowRegion));
nsIntPoint clientOffset = GetClientOffset();
childWindowRegion.MoveBy(-clientOffset);
RECT r;
::GetWindowRect(mWnd, &r);
childWindowRegion.MoveBy(-r.left, -r.top);
nsIntRect clientBounds;
topWindow->GetClientBounds(clientBounds);
nsIntRegion opaqueRegion;
opaqueRegion.Sub(clientBounds, mPossiblyTransparentRegion);
opaqueRegion.Or(opaqueRegion, childWindowRegion);
// Sometimes child windows overlap our bounds
opaqueRegion.And(opaqueRegion, clientBounds);
MARGINS margins = { 0, 0, 0, 0 };
DWORD_PTR dwStyle = ::GetWindowLongPtrW(hWnd, GWL_STYLE);