corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1977581 - Keep activating the parent window on Windows when destroying a child. r=win-reviewers,handyman, a=dsmith

Browse Source 
Bug 1902315 removed a PlaceBehind call here, which in this case happened
to also activate the window (via the aActivate = true parameter).

Keep raising the window manually, but with simpler APIs.

Differential Revision: https://phabricator.services.mozilla.com/D258743
This commit is contained in:
Emilio Cobos Álvarez
2025-08-05 09:12:04 +00:00
committed by dsmith@mozilla.com
parent 78b1e3e8de
commit 5fe142be9a
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
xpfe/appshell/AppWindow.cpp
View File

@@ -547,6 +547,19 @@ NS_IMETHODIMP AppWindow::Destroy() {
if (mWindow) mWindow->Show(false); if (mWindow) mWindow->Show(false);
#endif #endif
// Raise and focus our parent explicitly on Windows, if visible. Apparently
// Windows gets the z-order and focus wrong otherwise for nested modal
// windows, see bug 1977581.
#ifdef XP_WIN
if (nsCOMPtr<nsIBaseWindow> parent = do_QueryReferent(mParentWindow)) {
nsCOMPtr<nsIWidget> parentWidget;
parent->GetMainWidget(getter_AddRefs(parentWidget));
if (parentWidget && parentWidget->IsVisible()) {
parentWidget->SetFocus(nsIWidget::Raise::Yes, dom::CallerType::System);
}
}
#endif
RemoveTooltipSupport(); RemoveTooltipSupport();
mDOMWindow = nullptr; mDOMWindow = nullptr;