Added window focus handling to lighthouse

The idea is that QPlatformWindows can request focus handling. And when
actual focus shifting is done by windowsystem callbacks/events which are
sent to QWindowSystemInterface

1 files changed, 2 insertions, 6 deletions

diff --git a/src/gui/kernel/qwidget_qpa.cpp b/src/gui/kernel/qwidget_qpa.cpp
index 617d984bbd..1279e0a856 100644
--- a/src/gui/kernel/qwidget_qpa.cpp
+++ b/src/gui/kernel/qwidget_qpa.cpp
@@ -379,9 +379,8 @@ QWidget *QWidget::keyboardGrabber()
 
 void QWidget::activateWindow()
 {
-    // XXX
-//    qDebug() << "QWidget::activateWindow" << this;
-    QApplication::setActiveWindow(this); //#####
+    if (platformWindow())
+        platformWindow()->requestActivateWindow();
 }
 
 void QWidgetPrivate::show_sys()
@@ -409,9 +408,6 @@ void QWidgetPrivate::show_sys()
         }
         if (window)
             window->setVisible(true);
-
-        if (q->isWindow() && q->windowType() != Qt::Popup && q->windowType() != Qt::ToolTip && !(q->windowFlags() & Qt::X11BypassWindowManagerHint))
-            q->activateWindow(); //### QWindowSystemInterface should have callback function for when WS actually activates window.
     }
 }