diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2011-08-30 18:07:24 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-30 11:34:00 +0200 |
| commit | 1025fa7c5247405a3a7289d928addb740afbf95b (patch) | |
| tree | 0738d9252a8863fc5e52c577d5a7635ab85d7daa /src/qtquick1/graphicsitems | |
| parent | f6a312b76c221f4025a6a05b0bda02e55a8bd865 (diff) | |
QDeclarative::hasActiveFocus should return false for hidden items
Forward-port of a1b2be3c8a64aee832c648c6dcdff003f22318a3 from 4.8
Task-number: QTBUG-21045
Change-Id: I055e4dd18e43ccce92d0cae96b10809adb4dcc3a
Reviewed-on: http://codereview.qt.nokia.com/3857
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/qtquick1/graphicsitems')
| -rw-r--r-- | src/qtquick1/graphicsitems/qdeclarativeitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qtquick1/graphicsitems/qdeclarativeitem.cpp b/src/qtquick1/graphicsitems/qdeclarativeitem.cpp index 00d5fd672d..a480cb28fe 100644 --- a/src/qtquick1/graphicsitems/qdeclarativeitem.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativeitem.cpp @@ -3664,8 +3664,8 @@ void QDeclarativeItem::setSize(const QSizeF &size) bool QDeclarativeItem::hasActiveFocus() const { Q_D(const QDeclarativeItem); - return focusItem() == this || - (d->flags & QGraphicsItem::ItemIsFocusScope && focusItem() != 0); + return (focusItem() && focusItem()->isVisible()) && (focusItem() == this || + (d->flags & QGraphicsItem::ItemIsFocusScope && focusItem() != 0)); } /*! |