From c2f369a13d29ba6b52bc7ece747b884220fe69e4 Mon Sep 17 00:00:00 2001 From: Jim Mathies Date: Tue, 7 Sep 2010 12:30:28 -0500 Subject: [PATCH] Bug 588657 - Console and Inspector panel chrome flashes on windows 7. (Initial patch: Steve Glardon, Updates: jimm) r=vlad, a=blocking-beta6. --- widget/src/windows/nsWindow.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp index 556719cc4fd3..60fe3aa5bed2 100644 --- a/widget/src/windows/nsWindow.cpp +++ b/widget/src/windows/nsWindow.cpp @@ -1279,7 +1279,8 @@ void nsWindow::ClearThemeRegion() { #ifndef WINCE if (nsUXThemeData::sIsVistaOrLater && !HasGlass() && - mWindowType == eWindowType_popup && (mPopupType == ePopupTypeTooltip || mPopupType == ePopupTypePanel)) { + (mWindowType == eWindowType_popup && !IsPopupWithTitleBar() && + (mPopupType == ePopupTypeTooltip || mPopupType == ePopupTypePanel))) { SetWindowRgn(mWnd, NULL, false); } #endif @@ -1294,7 +1295,8 @@ void nsWindow::SetThemeRegion() // state values from nsNativeThemeWin's GetThemePartAndState, but currently windows that // change shape based on state haven't come up. if (nsUXThemeData::sIsVistaOrLater && !HasGlass() && - mWindowType == eWindowType_popup && (mPopupType == ePopupTypeTooltip || mPopupType == ePopupTypePanel)) { + (mWindowType == eWindowType_popup && !IsPopupWithTitleBar() && + (mPopupType == ePopupTypeTooltip || mPopupType == ePopupTypePanel))) { HRGN hRgn = nsnull; RECT rect = {0,0,mBounds.width,mBounds.height};