diff options
| author | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-16 01:40:18 (GMT) |
|---|---|---|
| committer | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-16 01:40:18 (GMT) |
| commit | a7c3ea93e0a1cd56f585a9ce04e6d1b99f4c7a34 (patch) | |
| tree | 0ccc262ac7d0d825d1a8c6868307affa444a9e75 /src/gui/graphicsview/qgraphicsitem_p.h | |
| parent | 227dd18f0e25ee522e5a4323e849590a314dd4cd (diff) | |
| parent | a4571547a38d68d6778bf0ebfa4dc26cc3d865a3 (diff) | |
| download | Qt-a7c3ea93e0a1cd56f585a9ce04e6d1b99f4c7a34.zip Qt-a7c3ea93e0a1cd56f585a9ce04e6d1b99f4c7a34.tar.gz Qt-a7c3ea93e0a1cd56f585a9ce04e6d1b99f4c7a34.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem_p.h')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem_p.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index b891de3..fd2ff34 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -129,6 +129,7 @@ public: itemDepth(-1), focusProxy(0), subFocusItem(0), + focusScopeItem(0), imHints(Qt::ImhNone), acceptedMouseButtons(0x1f), visible(1), @@ -318,7 +319,11 @@ public: void invalidateCachedClipPathRecursively(bool childrenOnly = false, const QRectF &emptyIfOutsideThisRect = QRectF()); void updateCachedClipPathFromSetPosHelper(const QPointF &newPos); void ensureSceneTransformRecursive(QGraphicsItem **topMostDirtyItem); - void ensureSceneTransform(); + inline void ensureSceneTransform() + { + QGraphicsItem *that = q_func(); + ensureSceneTransformRecursive(&that); + } inline bool hasTranslateOnlySceneTransform() { @@ -408,9 +413,11 @@ public: || (childrenCombineOpacity() && isFullyTransparent()); } - void setSubFocus(); - void clearSubFocus(); + void setFocusHelper(Qt::FocusReason focusReason, bool climb); + void setSubFocus(QGraphicsItem *rootItem = 0); + void clearSubFocus(QGraphicsItem *rootItem = 0); void resetFocusProxy(); + virtual void subFocusItemChange(); inline QTransform transformToParent() const; inline void ensureSortedChildren(); @@ -435,6 +442,7 @@ public: QGraphicsItem *focusProxy; QList<QGraphicsItem **> focusProxyRefs; QGraphicsItem *subFocusItem; + QGraphicsItem *focusScopeItem; Qt::InputMethodHints imHints; // Packed 32 bits |