diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-20 13:09:42 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-21 14:14:50 +0200 |
commit | 8e48184120f74c02447c8d96408c1c003cd7fd79 (patch) | |
tree | 497028e8f49aa8d2dfe8ecdfd4003eff3d538871 /src/plugins/platforms/windows/qwindowswindow.cpp | |
parent | beab436d77476c93d50d8608c15b369044937d7f (diff) |
Start the native interface QWindowsApplication
Implement the static parts of QWindowsWindowFunctions.
Move some things around and make them static in tablet support
to make this easier.
Task-number: QTBUG-83252
Change-Id: I24c3b0b3c6548eb96c4f3285a4e46385a1e79ef5
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowswindow.cpp')
-rw-r--r-- | src/plugins/platforms/windows/qwindowswindow.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index ca278a4773..8df4bb3428 100644 --- a/src/plugins/platforms/windows/qwindowswindow.cpp +++ b/src/plugins/platforms/windows/qwindowswindow.cpp @@ -2547,8 +2547,9 @@ void QWindowsWindow::requestActivateWindow() // when activating windows of inactive applications. Attach to the input of the // currently active window while setting the foreground window to always activate // the window when desired. + const auto activationBehavior = QWindowsIntegration::instance()->windowActivationBehavior(); if (QGuiApplication::applicationState() != Qt::ApplicationActive - && QWindowsNativeInterface::windowActivationBehavior() == QWindowsWindowFunctions::AlwaysActivateWindow) { + && activationBehavior == QWindowsApplication::AlwaysActivateWindow) { if (const HWND foregroundWindow = GetForegroundWindow()) { foregroundThread = GetWindowThreadProcessId(foregroundWindow, nullptr); if (foregroundThread && foregroundThread != currentThread) |