Only active QGraphicsScenes can have active input focus.

This change ensures that only active scenes can have active input
focus items. If you try to set input focus on items that are in an
inactive scene, these items will gain input focus only when the scene
is activated.

For scenes attached to a view, this change should only fix the bug that
you could have a blinking line edit in a scene when the view is inactive,
meaning you couldn't type into the line edit.

For scenes that have no view, you now must activate the scene in order
to give the items active input focus. This will affect those who use
QGraphicsScene with custom key and focus handling.

Reviewed-by: brad

1 files changed, 24 insertions, 0 deletions

diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
index f78c59e256..6998684dcf 100644
--- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -1376,6 +1376,9 @@ void tst_QGraphicsScene::removeItem()
 void tst_QGraphicsScene::focusItem()
 {
     QGraphicsScene scene;
+    QEvent activate(QEvent::WindowActivate);
+    QApplication::sendEvent(&scene, &activate);
+
     QVERIFY(!scene.focusItem());
     QGraphicsItem *item = scene.addText("Qt");
     QVERIFY(!scene.focusItem());
@@ -1434,6 +1437,9 @@ protected:
 void tst_QGraphicsScene::focusItemLostFocus()
 {
     QGraphicsScene scene;
+    QEvent activate(QEvent::WindowActivate);
+    QApplication::sendEvent(&scene, &activate);
+
     FocusItem *item = new FocusItem;
     item->setTextInteractionFlags(Qt::TextEditorInteraction);
     scene.addItem(item);
@@ -1458,6 +1464,9 @@ void tst_QGraphicsScene::clear()
 void tst_QGraphicsScene::setFocusItem()
 {
     QGraphicsScene scene;
+    QEvent activate(QEvent::WindowActivate);
+    QApplication::sendEvent(&scene, &activate);
+
     QGraphicsItem *item = scene.addText("Qt");
     QVERIFY(!scene.focusItem());
     QVERIFY(!scene.hasFocus());
@@ -1885,6 +1894,9 @@ void tst_QGraphicsScene::mouseEventPropagation()
 
     // scene -> a -> b -> c -> d
     QGraphicsScene scene;
+    QEvent activate(QEvent::WindowActivate);
+    QApplication::sendEvent(&scene, &activate);
+
     scene.addItem(a);
 
     // Prepare some events
@@ -2069,6 +2081,9 @@ void tst_QGraphicsScene::mouseEventPropagation_focus()
 
     // scene -> a -> b -> c -> d
     QGraphicsScene scene;
+    QEvent activate(QEvent::WindowActivate);
+    QApplication::sendEvent(&scene, &activate);
+
     scene.addItem(a);
 
     // Prepare some events
@@ -2680,6 +2695,9 @@ void tst_QGraphicsScene::render()
 void tst_QGraphicsScene::contextMenuEvent()
 {
     QGraphicsScene scene;
+    QEvent activate(QEvent::WindowActivate);
+    QApplication::sendEvent(&scene, &activate);
+
     EventTester *item = new EventTester;
     scene.addItem(item);
     item->setFlag(QGraphicsItem::ItemIsFocusable);
@@ -3649,6 +3667,9 @@ void tst_QGraphicsScene::stickyFocus()
     QFETCH(bool, sticky);
 
     QGraphicsScene scene;
+    QEvent activate(QEvent::WindowActivate);
+    QApplication::sendEvent(&scene, &activate);
+
     QGraphicsTextItem *text = scene.addText("Hei");
     text->setTextInteractionFlags(Qt::TextEditorInteraction);
     text->setFocus();
@@ -3703,6 +3724,9 @@ void tst_QGraphicsScene::inputMethod()
     item->setFlags((QGraphicsItem::GraphicsItemFlags)flags);
 
     QGraphicsScene scene;
+    QEvent activate(QEvent::WindowActivate);
+    QApplication::sendEvent(&scene, &activate);
+
     scene.addItem(item);
     QInputMethodEvent event;