diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-08-05 04:36:57 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-08-05 04:38:13 (GMT) |
| commit | eb8c7d19c98d547f89caa1b5866fd2b5e43b32bf (patch) | |
| tree | 56656466ea742db7741fc9987d88b67375193e9f /src/gui/graphicsview/qgraphicsitem.cpp | |
| parent | 5a98d58c1ed78262c20b05aa178a92b4a1a097df (diff) | |
| download | Qt-eb8c7d19c98d547f89caa1b5866fd2b5e43b32bf.zip Qt-eb8c7d19c98d547f89caa1b5866fd2b5e43b32bf.tar.gz Qt-eb8c7d19c98d547f89caa1b5866fd2b5e43b32bf.tar.bz2 | |
Make sure onFocusChanged is correctly emitted for items in a FocusScope.
Task-number: QTBUG-12649
Reviewed-by: Martin Jones
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 1626d83..ff3dc1f 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -3259,8 +3259,12 @@ void QGraphicsItemPrivate::setFocusHelper(Qt::FocusReason focusReason, bool clim QGraphicsItem *p = parent; while (p) { if (p->flags() & QGraphicsItem::ItemIsFocusScope) { + QGraphicsItem *oldFocusScopeItem = p->d_ptr->focusScopeItem; p->d_ptr->focusScopeItem = q_ptr; if (!p->focusItem() && !focusFromShow) { + if (oldFocusScopeItem) + oldFocusScopeItem->d_ptr->focusScopeItemChange(false); + focusScopeItemChange(true); // If you call setFocus on a child of a focus scope that // doesn't currently have a focus item, then stop. return; @@ -5595,6 +5599,7 @@ void QGraphicsItemPrivate::subFocusItemChange() */ void QGraphicsItemPrivate::focusScopeItemChange(bool isSubFocusItem) { + Q_UNUSED(isSubFocusItem); } /*! |