From ce0349b410e75d221bcacc77d35fdedbb4214efc Mon Sep 17 00:00:00 2001 From: Morteza Jamshidi Date: Wed, 20 Nov 2024 14:00:51 +0100 Subject: [PATCH] Show window without activating if WindowDoesNotAcceptFocus flag is set MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added an extra condition to only show the window (without activation) if Qt::WindowDoesNotAcceptFocus flag is set. (Mostly from qml) Fixes: QTBUG-130912 Change-Id: I6b7a9cd03d726315b8531600c6a8b33436a3348b Reviewed-by: Tor Arne Vestbø (cherry picked from commit cf9c94e85160a9d0f03e284ff92995900076faee) Reviewed-by: Morteza Jamshidi Reviewed-by: Oliver Wolff --- src/plugins/platforms/windows/qwindowswindow.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index 57d3cf469fa..4a95a917cd3 100644 --- a/src/plugins/platforms/windows/qwindowswindow.cpp +++ b/src/plugins/platforms/windows/qwindowswindow.cpp @@ -2005,7 +2005,11 @@ void QWindowsWindow::show_sys() const } // Qt::WindowMaximized } // !Qt::WindowMinimized } - if (type == Qt::Popup || type == Qt::ToolTip || type == Qt::Tool || testShowWithoutActivating(w)) + if (type == Qt::Popup || + type == Qt::ToolTip || + type == Qt::Tool || + (flags & Qt::WindowDoesNotAcceptFocus) || + testShowWithoutActivating(w)) sm = SW_SHOWNOACTIVATE; if (w->windowStates() & Qt::WindowMaximized)