diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-03-08 04:55:56 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-03-08 07:57:27 (GMT) |
| commit | f47f01fd34d08f6152c9053c0d6928fc359aa0f9 (patch) | |
| tree | 52ade58742556e5c843f34b869af7c6bcfdd7477 /src/declarative/graphicsitems/qdeclarativetext_p_p.h | |
| parent | 0b2983f9339f1003159f3a746491928f74b593ba (diff) | |
| download | Qt-f47f01fd34d08f6152c9053c0d6928fc359aa0f9.zip Qt-f47f01fd34d08f6152c9053c0d6928fc359aa0f9.tar.gz Qt-f47f01fd34d08f6152c9053c0d6928fc359aa0f9.tar.bz2 | |
Use the text layout bounds calculated by QLayout.
We used to calculate the size and position of the cache image
ourselves. Rather use the line positions and bounding rect calculated
by QLayout.
Change-Id: I601688ab7e310b0015a1994adf52b108f39504d8
Reviewed-by: Joona Petrell
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetext_p_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetext_p_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetext_p_p.h b/src/declarative/graphicsitems/qdeclarativetext_p_p.h index 0864c8f..2e154a0 100644 --- a/src/declarative/graphicsitems/qdeclarativetext_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativetext_p_p.h @@ -115,7 +115,7 @@ public: bool requireImplicitWidth:1; bool hAlignImplicit:1; - QSize layedOutTextSize; + QRect layedOutTextRect; QSize paintedSize; qreal naturalWidth; virtual qreal implicitWidth() const; @@ -123,7 +123,7 @@ public: QPixmap textDocumentImage(bool drawStyle); QTextDocumentWithImageResources *doc; - QSize setupTextLayout(); + QRect setupTextLayout(); QPixmap textLayoutImage(bool drawStyle); void drawTextLayout(QPainter *p, const QPointF &pos, bool drawStyle); QDeclarativeTextLayout layout; |