From bb364c14157df635cf166b293f8cab6c22534aa1 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Wed, 7 Mar 2012 20:26:17 +0100 Subject: Fix QDeclarativeItem::hasActiveFocus(). This function returns true if the item (or, in case it's a focus scope, one of its children,) has focus (i.e., will receive key events now), or will receive focus once the scene is activated. It also returns true if the item has not yet been added to a scene, but has subFocus, implicating that someone has called setFocus() on it prior to it being added to the scene; the latter case seen most commonly in unit tests. Task-number: QTBUG-24681 Change-Id: Ia1265158108d5d856b57e34a8efee2545cd0deeb Reviewed-by: Andreas Aardal Hanssen Reviewed-by: Alan Alpert Reviewed-by: Girish Ramakrishnan --- src/declarative/graphicsitems/qdeclarativeitem.cpp | 7 ++++-- .../qdeclarativeitem/tst_qdeclarativeitem.cpp | 28 ++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index a78f8a6a..86d4f6f7 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -3600,8 +3600,11 @@ void QDeclarativeItem::setSize(const QSizeF &size) bool QDeclarativeItem::hasActiveFocus() const { Q_D(const QDeclarativeItem); - return (focusItem() && focusItem()->isVisible()) && (focusItem() == this || - (d->flags & QGraphicsItem::ItemIsFocusScope && focusItem() != 0)); + QGraphicsItem *fi = focusItem(); + QGraphicsScene *s = scene(); + bool hasOrWillGainFocus = fi && fi->isVisible() && (!s || s->focusItem() == fi); + bool isOrIsScopeOfFocusItem = (fi == this || (d->flags & QGraphicsItem::ItemIsFocusScope)); + return hasOrWillGainFocus && isOrIsScopeOfFocusItem; } /*! diff --git a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp index 51e3463d..6359ca86 100644 --- a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp +++ b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp @@ -90,6 +90,7 @@ private slots: void testQtQuick11Attributes_data(); void qtbug_16871(); void qtbug_21045(); + void hasActiveFocusAfterClear(); private: QDeclarativeEngine engine; }; @@ -1250,6 +1251,33 @@ void tst_QDeclarativeItem::qtbug_21045() QVERIFY(!i->hasActiveFocus()); } +void tst_QDeclarativeItem::hasActiveFocusAfterClear() +{ + QGraphicsScene scene; + QGraphicsView view(&scene); + view.show(); + + QDeclarativeEngine engine; + QDeclarativeComponent qmlComponent(&engine); + qmlComponent.setData( + "import QtQuick 1.1;" + "TextInput {" + "width: 100; height: 100;" + "Rectangle { anchors.fill: parent; color: \"yellow\"; z: parent.z - 1 }" + "}", QUrl()); + QDeclarativeItem *createdItem = qobject_cast(qmlComponent.create(engine.rootContext())); + QVERIFY(createdItem != 0); + + scene.addItem(createdItem); + + createdItem->QGraphicsItem::setFocus(); + QCoreApplication::processEvents(); + scene.setFocusItem(0); + QCoreApplication::processEvents(); + + QVERIFY(!createdItem->hasActiveFocus()); +} + QTEST_MAIN(tst_QDeclarativeItem) #include "tst_qdeclarativeitem.moc" -- cgit v1.2.3