Added QWindow::isActive() and focus in / out events.

Renamed QGuiApplication::activeWindow() to
QGuiApplication::focusWindow(), implemented QWindow::isActive() as a
style hint, and added focus in / out events.

Change-Id: I71866e76c5a817def3e17bcc20a4fc32081a0e7a
Reviewed-on: http://codereview.qt-project.org/5811
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>

1 files changed, 17 insertions, 5 deletions

diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index bfa60fa657..986fc5c11d 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -114,7 +114,7 @@ QClipboard *QGuiApplicationPrivate::qt_clipboard = 0;
 QList<QScreen *> QGuiApplicationPrivate::screen_list;
 
 QWindowList QGuiApplicationPrivate::window_list;
-QWindow *QGuiApplicationPrivate::active_window = 0;
+QWindow *QGuiApplicationPrivate::focus_window = 0;
 
 Q_GLOBAL_STATIC(QMutex, applicationFontMutex)
 QFont *QGuiApplicationPrivate::app_font = 0;
@@ -181,9 +181,9 @@ QGuiApplicationPrivate::QGuiApplicationPrivate(int &argc, char **argv, int flags
     self = this;
 }
 
-QWindow *QGuiApplication::activeWindow()
+QWindow *QGuiApplication::focusWindow()
 {
-    return QGuiApplicationPrivate::active_window;
+    return QGuiApplicationPrivate::focus_window;
 }
 
 QWindowList QGuiApplication::topLevelWindows()
@@ -678,8 +678,20 @@ void QGuiApplicationPrivate::processActivatedEvent(QWindowSystemInterfacePrivate
     if (!e->activated)
         return;
 
-    QWindow *previous = QGuiApplicationPrivate::active_window;
-    QGuiApplicationPrivate::active_window = e->activated.data();
+    QWindow *previous = QGuiApplicationPrivate::focus_window;
+    QGuiApplicationPrivate::focus_window = e->activated.data();
+
+    if (previous == QGuiApplicationPrivate::focus_window)
+        return;
+
+    if (previous) {
+        QFocusEvent focusOut(QEvent::FocusOut);
+        QCoreApplication::sendSpontaneousEvent(previous, &focusOut);
+    }
+
+    QFocusEvent focusIn(QEvent::FocusIn);
+    QCoreApplication::sendSpontaneousEvent(QGuiApplicationPrivate::focus_window, &focusIn);
+
     if (self)
         self->notifyActiveWindowChange(previous);
 }