diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-10-15 06:23:35 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-10-15 06:23:35 (GMT) |
| commit | 372ad766c953234c3b1f161ab5447daa5569b6b0 (patch) | |
| tree | 6e0a0ed047d584558e0067429315f9035a7db6bf /src/declarative | |
| parent | 0a0842ce6bc6a2d2731092c50c69a5ff3dc9b010 (diff) | |
| parent | de8c9d69fa7c7cc50e9a238e58f6e9370f158fc4 (diff) | |
| download | Qt-372ad766c953234c3b1f161ab5447daa5569b6b0.zip Qt-372ad766c953234c3b1f161ab5447daa5569b6b0.tar.gz Qt-372ad766c953234c3b1f161ab5447daa5569b6b0.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetext.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp index 308aefa..0717b78 100644 --- a/src/declarative/graphicsitems/qdeclarativetext.cpp +++ b/src/declarative/graphicsitems/qdeclarativetext.cpp @@ -270,6 +270,7 @@ void QDeclarativeTextPrivate::updateSize() internalWidthUpdate = false; q->setImplicitHeight(size.height()); emit q->paintedSizeChanged(); + q->update(); } /*! @@ -1143,9 +1144,10 @@ QRectF QDeclarativeText::boundingRect() const void QDeclarativeText::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) { Q_D(QDeclarativeText); - if (!d->internalWidthUpdate && newGeometry.width() != oldGeometry.width() && - (d->wrapMode != QDeclarativeText::NoWrap || d->elideMode != QDeclarativeText::ElideNone)) { - + if ((!d->internalWidthUpdate && newGeometry.width() != oldGeometry.width()) + && (d->wrapMode != QDeclarativeText::NoWrap + || d->elideMode != QDeclarativeText::ElideNone + || d->hAlign != Qt::AlignLeft)) { if (d->singleline && d->elideMode != QDeclarativeText::ElideNone && widthValid()) { // We need to re-elide d->updateLayout(); |