diff options
Diffstat (limited to 'src/declarative/items/qsgtext_p_p.h')
-rw-r--r-- | src/declarative/items/qsgtext_p_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/declarative/items/qsgtext_p_p.h b/src/declarative/items/qsgtext_p_p.h index ddd54b6f0c..8b83263f6f 100644 --- a/src/declarative/items/qsgtext_p_p.h +++ b/src/declarative/items/qsgtext_p_p.h @@ -80,6 +80,7 @@ public: bool setHAlign(QSGText::HAlignment, bool forceAlign = false); void mirrorChange(); QTextDocument *textDocument(); + bool isLineLaidOutConnected(); QString text; QFont font; @@ -121,6 +122,7 @@ public: bool layoutTextElided:1; bool richTextAsImage:1; bool textureImageCacheDirty:1; + bool textHasChanged:1; QRect layedOutTextRect; QSize paintedSize; @@ -132,11 +134,14 @@ public: QSGTextDocumentWithImageResources *doc; QRect setupTextLayout(); + void setupCustomLineGeometry(QTextLine &line, qreal &height, qreal elideWidth); QPixmap textLayoutImage(bool drawStyle); void drawTextLayout(QPainter *p, const QPointF &pos, bool drawStyle); bool isLinkActivatedConnected(); QString anchorAt(const QPointF &pos); QTextLayout layout; + QList<QRectF> linesRects; + QSGTextLine *textLine; static QPixmap drawOutline(const QPixmap &source, const QPixmap &styleSource); static QPixmap drawOutline(const QPixmap &source, const QPixmap &styleSource, int yOffset); @@ -154,6 +159,7 @@ public: #if defined(Q_OS_MAC) QThread *layoutThread; + QThread *paintingThread; #endif }; |