QNX: Fix focus handling for secondary screen

This patch removes the activaton aand deactivation of a window when we get the window group
activated event from the navigator. This event is sent to both the primary and secondary screen
and does not state if a window should be active from a Qt perspective.
A window should only be active if it has screen keyboard focus.

Change-Id: Ibbed0dd76a21d86f4b580265f996357a8eef5192
Reviewed-by: Roger Maclean <rmaclean@qnx.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>

1 files changed, 9 insertions, 7 deletions

diff --git a/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp b/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp
index 37071d825c..1e33e2b50f 100644
--- a/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp
+++ b/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp
@@ -341,10 +341,6 @@ void QQnxScreenEventHandler::handlePointerEvent(screen_event_t event)
         }
     }
 
-    // If we don't have a navigator, we don't get activation events.
-    if (buttonState && w && w != QGuiApplication::focusWindow() && !m_qnxIntegration->supportsNavigatorEvents())
-        QWindowSystemInterface::handleWindowActivated(w);
-
     m_lastMouseWindow = qnxWindow;
 
     // Apply scaling to wheel delta and invert value for Qt. We'll probably want to scale
@@ -616,9 +612,15 @@ void QQnxScreenEventHandler::handleKeyboardFocusPropertyEvent(screen_window_t wi
     if (window && screen_get_window_property_iv(window, SCREEN_PROPERTY_KEYBOARD_FOCUS, &focus) != 0)
         qFatal("QQnx: failed to query keyboard focus property, errno=%d", errno);
 
-    QWindow *w = focus ? QQnxIntegration::window(window) : 0;
-
-    QWindowSystemInterface::handleWindowActivated(w);
+    QWindow *focusWindow = QQnxIntegration::window(window);
+    if (focus) {
+        QWindowSystemInterface::handleWindowActivated(focusWindow);
+    } else if (focusWindow == QGuiApplication::focusWindow()) {
+        // Deactivate only if the window was the focus window.
+        // Screen might send a keyboard focus event for a newly created
+        // window on the secondary screen, with focus 0.
+        QWindowSystemInterface::handleWindowActivated(0);
+    }
 }
 
 #include "moc_qqnxscreeneventhandler.cpp"