diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-09-16 08:22:48 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-09-16 08:22:48 (GMT) |
| commit | 78f0dd0f00506139eab54e7dc50f8980df78da63 (patch) | |
| tree | 9ec0f0256618446f4dd08be34eceb51852984074 /src/declarative/fx/qfxitem_p.h | |
| parent | 5d35dbc3552f722cf4de220d8737e8201e4f61e5 (diff) | |
| parent | 30377d51a8568b9b778b58a63fb036e35a879124 (diff) | |
| download | Qt-78f0dd0f00506139eab54e7dc50f8980df78da63.zip Qt-78f0dd0f00506139eab54e7dc50f8980df78da63.tar.gz Qt-78f0dd0f00506139eab54e7dc50f8980df78da63.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxitem_p.h')
| -rw-r--r-- | src/declarative/fx/qfxitem_p.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/declarative/fx/qfxitem_p.h b/src/declarative/fx/qfxitem_p.h index 054bdc7..df75148 100644 --- a/src/declarative/fx/qfxitem_p.h +++ b/src/declarative/fx/qfxitem_p.h @@ -108,7 +108,7 @@ public: widthValid(false), heightValid(false), _componentComplete(true), _keepMouse(false), smooth(false), keyHandler(0), - width(0), height(0) + width(0), height(0), implicitWidth(0), implicitHeight(0) {} ~QFxItemPrivate() { delete _anchors; } @@ -213,6 +213,8 @@ public: qreal width; qreal height; + qreal implicitWidth; + qreal implicitHeight; QPointF computeTransformOrigin() const; @@ -224,8 +226,11 @@ public: q->geometryChanged(QRectF(this->pos.x(), this->pos.y(), width, height), oldGeometry); } - // Inherited from QGraphcisItemPrivate - virtual void focusedInScopeChanged(); + // Reimplemented from QGraphicsItemPrivate + virtual void subFocusItemChange() + { + emit q_func()->wantsFocusChanged(); + } }; QT_END_NAMESPACE |