chore: Import windows titlebar calculation for RC build 2, b=no-bug, c=no-component

2026-02-18 17:38:23 +00:00 · 2025-12-07 00:25:24 +01:00
parent fa6bb8d27f
commit 53181ea34c
6 changed files with 243 additions and 13 deletions
--- a/src/firefox-patches/147_windows_border_fix_1.patch
+++ b/src/firefox-patches/147_windows_border_fix_1.patch
@@ -0,0 +1,91 @@
+From 433cc8224790300fdabe76bd225b644c1812da34 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
+Date: Thu, 27 Nov 2025 15:28:12 +0000
+Subject: [PATCH] Bug 1993474 - Ensure our WNDPROC has precedence over
+ WinAppSDK's. r=gstoll,win-reviewers
+
+See the comment for reasoning. WM_NCCALCSIZE wasn't getting called, and
+we rely on that to get the right client area on things like maximized
+windows.
+
+Differential Revision: https://phabricator.services.mozilla.com/D274281
+---
+ widget/windows/nsWindow.cpp | 32 ++++++++++++++++++++++----------
+ widget/windows/nsWindow.h   |  2 ++
+ 2 files changed, 24 insertions(+), 10 deletions(-)
+
+diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
+index 0b98d157097da..b357df236cfcd 100644
+--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
+@@ -1520,12 +1520,31 @@ DWORD nsWindow::WindowExStyle() {
+  *
+  **************************************************************/
+ 
+bool nsWindow::ShouldAssociateWithWinAppSDK() const {
+  // We currently don't need any SDK functionality for for PiP windows,
+  // and using the SDK on these windows causes them to go under the
+  // taskbar (bug 1995838).
+  //
+  // TODO(emilio): That might not be true anymore after bug 1993474,
+  // consider re-testing and removing that special-case.
+  return IsTopLevelWidget() && !mIsPIPWindow;
+}
+
+ bool nsWindow::AssociateWithNativeWindow() {
+   if (!mWnd || !IsWindow(mWnd)) {
+     NS_ERROR("Invalid window handle");
+     return false;
+   }
+ 
+  if (ShouldAssociateWithWinAppSDK()) {
+    // Make sure to call this here to associate our window with the
+    // Windows App SDK _before_ setting our WNDPROC, if needed.
+    // This is important because the SDKs WNDPROC might handle messages like
+    // WM_NCCALCSIZE without calling into us, and that can cause sizing issues,
+    // see bug 1993474.
+    WindowsUIUtils::SetIsTitlebarCollapsed(mWnd, mCustomNonClient);
+  }
+
+   // Connect the this pointer to the native window handle.
+   // This should be done before SetWindowLongPtrW, because nsWindow::WindowProc
+   // uses WinUtils::GetNSWindowPtr internally.
+@@ -1552,12 +1571,7 @@ void nsWindow::DissociateFromNativeWindow() {
+   DebugOnly<WNDPROC> wndProcBeforeDissociate =
+       reinterpret_cast<WNDPROC>(::SetWindowLongPtrW(
+           mWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(*mPrevWndProc)));
+-  // If we've used the Windows App SDK to remove the minimize/maximize/close
+-  // entries from the titlebar, then the Windows App SDK sets its own WNDPROC
+-  // own the window, so this assertion would fail. But we only do this if
+-  // Mica is available.
+-  NS_ASSERTION(WinUtils::MicaAvailable() ||
+-                   wndProcBeforeDissociate == nsWindow::WindowProc,
+  NS_ASSERTION(wndProcBeforeDissociate == nsWindow::WindowProc,
+                "Unstacked an unexpected native window procedure");
+ 
+   WinUtils::SetNSWindowPtr(mWnd, nullptr);
+@@ -2835,9 +2849,7 @@ void nsWindow::SetCustomTitlebar(bool aCustomTitlebar) {
+     mCustomNonClientMetrics = {};
+     ResetLayout();
+   }
+-  // Not needed for PiP windows, and using the Windows App SDK on
+-  // these windows causes them to go under the taskbar (bug 1995838)
+-  if (!mPIPWindow) {
+  if (ShouldAssociateWithWinAppSDK()) {
+     WindowsUIUtils::SetIsTitlebarCollapsed(mWnd, mCustomNonClient);
+   }
+ }
+diff --git a/widget/windows/nsWindow.h b/widget/windows/nsWindow.h
+index 20f016757dfee..2756b248368a3 100644
+--- a/widget/windows/nsWindow.h
+++ b/widget/windows/nsWindow.h
+@@ -335,6 +335,8 @@ class nsWindow final : public nsIWidget {
+ 
+   bool IsRTL() const { return mIsRTL; }
+ 
+  bool ShouldAssociateWithWinAppSDK() const;
+
+   /**
+    * AssociateDefaultIMC() associates or disassociates the default IMC for
+    * the window.
+ 
--- a/src/firefox-patches/147_windows_border_fix_2.patch
+++ b/src/firefox-patches/147_windows_border_fix_2.patch
@@ -0,0 +1,58 @@
+diff --git a/widget/windows/nsWindow.h b/widget/windows/nsWindow.h
+--- a/widget/windows/nsWindow.h
+++ b/widget/windows/nsWindow.h
+@@ -850,13 +850,10 @@
+   bool mHasTaskbarIconBeenCreated = false;
+ 
+   // Whether we're in the process of sending a WM_SETTEXT ourselves
+   bool mSendingSetText = false;
+ 
+-  // Whether we're a PIP window.
+-  bool mPIPWindow : 1;
+-
+   // Whether we are asked to render a mica backdrop.
+   bool mMicaBackdrop : 1;
+ 
+   int32_t mCachedHitTestResult = 0;
+ 
+diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
+--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
+@@ -815,11 +815,10 @@
+  **************************************************************/
+ 
+ nsWindow::nsWindow()
+     : nsIWidget(BorderStyle::Default),
+       mFrameState(std::in_place, this),
+-      mPIPWindow(false),
+       mMicaBackdrop(false),
+       mLastPaintEndTime(TimeStamp::Now()),
+       mCachedHitTestTime(TimeStamp::Now()),
+       mSizeConstraintsScale(GetDefaultScale().scale) {
+   if (!gInitializedVirtualDesktopManager) {
+@@ -1026,11 +1025,10 @@
+ 
+   HWND parent =
+       aParent ? (HWND)aParent->GetNativeData(NS_NATIVE_WINDOW) : nullptr;
+ 
+   mIsRTL = aInitData.mRTL;
+-  mPIPWindow = aInitData.mPIPWindow;
+   mOpeningAnimationSuppressed = aInitData.mIsAnimationSuppressed;
+   mAlwaysOnTop = aInitData.mAlwaysOnTop;
+   mIsAlert = aInitData.mIsAlert;
+   mResizable = aInitData.mResizable;
+ 
+@@ -2805,11 +2803,11 @@
+   } else if (sizeMode == nsSizeMode_Maximized) {
+     // We make the entire frame part of the client area. We leave the default
+     // frame sizes for left, right and bottom since Windows will automagically
+     // position the edges "offscreen" for maximized windows.
+     metrics.mOffset.top = metrics.mCaptionHeight;
+-  } else if (mPIPWindow &&
+  } else if (mIsPIPWindow &&
+              !StaticPrefs::widget_windows_pip_decorations_enabled()) {
+     metrics.mOffset = metrics.DefaultMargins();
+   } else {
+     metrics.mOffset = NormalWindowNonClientOffset();
+   }
+
--- a/src/firefox-patches/147_windows_border_fix_3.patch
+++ b/src/firefox-patches/147_windows_border_fix_3.patch
@@ -0,0 +1,34 @@
+From dd4460727998a53e9fa7372afba2a93a9546cec3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
+Date: Fri, 28 Nov 2025 15:06:26 +0000
+Subject: [PATCH] Bug 2002986 - Use IAppWindowTitlebar::ResetToDefault() for
+ non-collapsed titlebar. r=win-reviewers,gstoll
+
+This seems to actually go to the default DWM stuff and is the documented
+way of doing so:
+
+https://learn.microsoft.com/en-us/windows/apps/develop/title-bar#reset-the-title-bar
+
+Differential Revision: https://phabricator.services.mozilla.com/D274413
+---
+ widget/windows/WindowsUIUtils.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/widget/windows/WindowsUIUtils.cpp b/widget/windows/WindowsUIUtils.cpp
+index a5a6c893e7056..abaabfba69dfa 100644
+--- a/widget/windows/WindowsUIUtils.cpp
+++ b/widget/windows/WindowsUIUtils.cpp
+@@ -1394,7 +1394,11 @@ void WindowsUIUtils::SetIsTitlebarCollapsed(HWND aWnd, bool aIsCollapsed) {
+     MOZ_ASSERT_UNREACHABLE("IAppWindowTitleBar could not be acquired");
+     return;
+   }
+-  hr = titleBar->put_ExtendsContentIntoTitleBar(aIsCollapsed);
+  if (aIsCollapsed) {
+    hr = titleBar->put_ExtendsContentIntoTitleBar(aIsCollapsed);
+  } else {
+    hr = titleBar->ResetToDefault();
+  }
+   if (FAILED(hr)) {
+     MOZ_LOG(gWindowsLog, LogLevel::Error,
+             ("Skipping SetIsTitlebarCollapsed() because "
+ 
--- a/src/firefox-patches/147_windows_border_fix_4.patch
+++ b/src/firefox-patches/147_windows_border_fix_4.patch
@@ -0,0 +1,34 @@
+From dd4460727998a53e9fa7372afba2a93a9546cec3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
+Date: Fri, 28 Nov 2025 15:06:26 +0000
+Subject: [PATCH] Bug 2002986 - Use IAppWindowTitlebar::ResetToDefault() for
+ non-collapsed titlebar. r=win-reviewers,gstoll
+
+This seems to actually go to the default DWM stuff and is the documented
+way of doing so:
+
+https://learn.microsoft.com/en-us/windows/apps/develop/title-bar#reset-the-title-bar
+
+Differential Revision: https://phabricator.services.mozilla.com/D274413
+---
+ widget/windows/WindowsUIUtils.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/widget/windows/WindowsUIUtils.cpp b/widget/windows/WindowsUIUtils.cpp
+index a5a6c893e7056..abaabfba69dfa 100644
+--- a/widget/windows/WindowsUIUtils.cpp
+++ b/widget/windows/WindowsUIUtils.cpp
+@@ -1394,7 +1394,11 @@ void WindowsUIUtils::SetIsTitlebarCollapsed(HWND aWnd, bool aIsCollapsed) {
+     MOZ_ASSERT_UNREACHABLE("IAppWindowTitleBar could not be acquired");
+     return;
+   }
+-  hr = titleBar->put_ExtendsContentIntoTitleBar(aIsCollapsed);
+  if (aIsCollapsed) {
+    hr = titleBar->put_ExtendsContentIntoTitleBar(aIsCollapsed);
+  } else {
+    hr = titleBar->ResetToDefault();
+  }
+   if (FAILED(hr)) {
+     MOZ_LOG(gWindowsLog, LogLevel::Error,
+             ("Skipping SetIsTitlebarCollapsed() because "
+