diff options
| author | Morteza Jamshidi <morteza.jamshidi@qt.io> | 2024-11-20 14:00:51 +0100 |
|---|---|---|
| committer | Morteza Jamshidi <morteza.jamshidi@qt.io> | 2025-01-24 18:53:34 +0100 |
| commit | cf9c94e85160a9d0f03e284ff92995900076faee (patch) | |
| tree | 120135dba5eaa021d7c9f269034262e95697f1bd | |
| parent | 13109ba350686cd8ce8e298db5d76d0e7c209bd1 (diff) | |
Show window without activating if WindowDoesNotAcceptFocus flag is set
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ø <tor.arne.vestbo@qt.io>
| -rw-r--r-- | src/plugins/platforms/windows/qwindowswindow.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index 0dc295cc8ce..3a9bf6bea9f 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) |