diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-10-04 01:59:38 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-10-04 02:00:45 (GMT) |
| commit | 29ddbd6f3021bd69a7badedc9749850ec1c1dabf (patch) | |
| tree | 48d14064c8c505970e79d555465548fc69b18dbd | |
| parent | d7c052a509191a0a5c632391ce318c5036900a18 (diff) | |
| download | Qt-29ddbd6f3021bd69a7badedc9749850ec1c1dabf.zip Qt-29ddbd6f3021bd69a7badedc9749850ec1c1dabf.tar.gz Qt-29ddbd6f3021bd69a7badedc9749850ec1c1dabf.tar.bz2 | |
Fix clipping behavior for non-cached text.
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetext.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetext_p_p.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp index c2dd850..65f1564 100644 --- a/src/declarative/graphicsitems/qdeclarativetext.cpp +++ b/src/declarative/graphicsitems/qdeclarativetext.cpp @@ -1143,7 +1143,7 @@ void QDeclarativeText::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWid } else { qreal y = boundingRect().y(); - bool needClip = !clip() && (d->cachedLayoutSize.width() > width() || + bool needClip = clip() && (d->cachedLayoutSize.width() > width() || d->cachedLayoutSize.height() > height()); if (needClip) { diff --git a/src/declarative/graphicsitems/qdeclarativetext_p_p.h b/src/declarative/graphicsitems/qdeclarativetext_p_p.h index ba1ec78..db68558 100644 --- a/src/declarative/graphicsitems/qdeclarativetext_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativetext_p_p.h @@ -66,7 +66,6 @@ QT_BEGIN_NAMESPACE class QTextLayout; class QTextDocumentWithImageResources; -#define QML_NO_TEXT_CACHE class QDeclarativeTextPrivate : public QDeclarativeItemPrivate { Q_DECLARE_PUBLIC(QDeclarativeText) |