Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1922250 - Do not force-clear the nc-area after consuming the skeleton UI window. r=win-reviewers,rkraesig

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D224933
This commit is contained in:
Emilio Cobos Álvarez 2024-10-16 12:13:53 +00:00
parent 3805683b51
commit f42eddc8ca
3 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
widget/windows/nsWindow.cpp
View File

@ -953,6 +953,9 @@ nsresult nsWindow::Create(nsIWidget* aParent, const LayoutDeviceIntRect& aRect,
// default prefs on Windows. Bug 1673092 tracks lining this up with
// that more correctly instead of hard-coding it.
SetNonClientMargins(LayoutDeviceIntMargin(0, 2, 2, 2));
// The skeleton UI already painted over the NC area, so there's no need
// to do that again; the effective non-client margins haven't changed.
mNeedsNCAreaClear = false;
// Reset the WNDPROC for this window and its whole class, as we had
// to use our own WNDPROC when creating the the skeleton UI window.
@ -1591,6 +1594,13 @@ void nsWindow::Show(bool aState) {
// The first time we decide to actually show the window is when we decide
// that we've taken over the window from the skeleton UI, and we should
// no longer treat resizes / moves specially.
//
// NOTE(emilio): mIsShowingPreXULSkeletonUI feels a bit odd, or at least
// misnamed. During regular startup we create the skeleton UI, then the
// early blank window consumes it, and at that point we set
// mIsShowingPreXULSkeletonUI to false, but in fact, we're still showing
// the skeleton UI (because the blank window is, well, blank). We should
// consider guarding this with !mIsEarlyBlankWindow...
mIsShowingPreXULSkeletonUI = false;
// Concomitantly, this is also when we change the cursor away from the
// default "wait" cursor.
@ -2738,6 +2748,8 @@ bool nsWindow::UpdateNonClientMargins(bool aReflowWindow) {
}
UpdateOpaqueRegionInternal();
// We probably shouldn't need to clear the NC-area if we're an opaque window,
// but we need to in order to work around bug 642851.
mNeedsNCAreaClear = true;
if (aReflowWindow) {
@ -2750,38 +2762,33 @@ bool nsWindow::UpdateNonClientMargins(bool aReflowWindow) {
}
nsresult nsWindow::SetNonClientMargins(const LayoutDeviceIntMargin& margins) {
if (!mIsTopWidgetWindow || mBorderStyle == BorderStyle::None) {
if (!mIsTopWidgetWindow || mBorderStyle == BorderStyle::None ||
margins.top < -1 || margins.bottom < -1 || margins.left < -1 ||
margins.right < -1) {
return NS_ERROR_INVALID_ARG;
}
if (mNonClientMargins == margins) {
return NS_OK;
}
if (mHideChrome) {
mFutureMarginsOnceChromeShows = margins;
mFutureMarginsToUse = true;
return NS_OK;
}
mFutureMarginsToUse = false;
// Request for a reset
if (margins.top == -1 && margins.left == -1 && margins.right == -1 &&
margins.bottom == -1) {
mCustomNonClient = false;
mNonClientMargins = margins;
// Force a reflow of content based on the new client
// dimensions.
ResetLayout();
return NS_OK;
}
if (margins.top < -1 || margins.bottom < -1 || margins.left < -1 ||
margins.right < -1) {
return NS_ERROR_INVALID_ARG;
}
// -1 margins request a reset
mCustomNonClient = margins != LayoutDeviceIntMargin(-1, -1, -1, -1);
mNonClientMargins = margins;
mCustomNonClient = true;
if (!UpdateNonClientMargins()) {
NS_WARNING("UpdateNonClientMargins failed!");
return NS_OK;
// Force a reflow of content based on the new client dimensions.
if (mCustomNonClient) {
UpdateNonClientMargins();
} else {
ResetLayout();
}
return NS_OK;
@ -5094,7 +5101,8 @@ bool nsWindow::ProcessMessageInternal(UINT msg, WPARAM& wParam, LPARAM& lParam,
* do seem to always send a WM_NCPAINT message, so let's update on that.
*/
gfxDWriteFont::UpdateSystemTextVars();
if (mCustomNonClient) {
if (mCustomNonClient &&
mTransparencyMode == TransparencyMode::Transparent) {
// We rely on dwm for glass / semi-transparent window painting, so we
// just need to make sure to clear the non-client area next time we get
// around to doing a main-thread paint.

2
widget/windows/nsWindow.h
View File

@ -815,7 +815,7 @@ class nsWindow final : public nsBaseWidget {
// Pre-calculated outward offset applied to default frames
LayoutDeviceIntMargin mNonClientOffset;
// Margins set by the owner
LayoutDeviceIntMargin mNonClientMargins;
LayoutDeviceIntMargin mNonClientMargins{-1, -1, -1, -1};
// Margins we'd like to set once chrome is reshown:
LayoutDeviceIntMargin mFutureMarginsOnceChromeShows;
// Indicates we need to apply margins once toggling chrome into showing:

2
widget/windows/nsWindowGfx.cpp
View File

@ -157,7 +157,7 @@ bool nsWindow::OnPaint(uint32_t aNestingLevel) {
KnowsCompositor* knowsCompositor = renderer->AsKnowsCompositor();
WebRenderLayerManager* layerManager = renderer->AsWebRender();
const bool didResize = !mBounds.IsEqualEdges(mLastPaintBounds);
const bool didResize = mBounds.Size() != mLastPaintBounds.Size();
if (didResize && knowsCompositor && layerManager) {
// Do an early async composite so that we at least have something on the