diff options
author | Yann Bodson <yann.bodson@nokia.com> | 2012-02-02 11:51:45 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-07 01:12:14 +0100 |
commit | 41462816074b3309efa31febf224120aa66237df (patch) | |
tree | 27df2a46c51daf13e3a2c71e49b6ed34f8260ec5 /src/quick/items/qquicktext_p_p.h | |
parent | 87ae3da340bcc5d81e150f62a798b6b903f9a00e (diff) |
Remove pixmap text caching in QML text element
Task-number: QTBUG-24033
Change-Id: Ifa24482b98536300c2f4c643a86517a019de8a84
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/items/qquicktext_p_p.h')
-rw-r--r-- | src/quick/items/qquicktext_p_p.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/quick/items/qquicktext_p_p.h b/src/quick/items/qquicktext_p_p.h index 7585026df8..db84754c64 100644 --- a/src/quick/items/qquicktext_p_p.h +++ b/src/quick/items/qquicktext_p_p.h @@ -66,7 +66,6 @@ QT_BEGIN_NAMESPACE class QTextLayout; class QQuickTextDocumentWithImageResources; -class QSGPlainTexture; class Q_AUTOTEST_EXPORT QQuickTextPrivate : public QQuickImplicitSizeItemPrivate { @@ -110,28 +109,17 @@ public: static const QChar elideChar; - void markDirty(); - bool invalidateImageCache(); - void checkImageCache(); - QPixmap *imageCache; - QSGTexture *texture; - - bool imageCacheDirty:1; bool updateOnComponentComplete:1; bool updateLayoutOnPolish:1; bool richText:1; bool styledText:1; bool singleline:1; - bool cacheAllTextAsImage:1; - bool disableDistanceField:1; bool internalWidthUpdate:1; bool requireImplicitWidth:1; bool truncated:1; bool hAlignImplicit:1; bool rightToLeftText:1; bool layoutTextElided:1; - bool richTextAsImage:1; - bool textureImageCacheDirty:1; bool textHasChanged:1; bool needToUpdateLayout:1; @@ -141,33 +129,20 @@ public: virtual qreal getImplicitWidth() const; void ensureDoc(); - QPixmap textDocumentImage(bool drawStyle); QQuickTextDocumentWithImageResources *doc; QRect setupTextLayout(); void setupCustomLineGeometry(QTextLine &line, qreal &height, int lineOffset = 0); - QPixmap textLayoutImage(bool drawStyle); - void drawTextLayout(QPainter *p, const QPointF &pos, bool drawStyle); bool isLinkActivatedConnected(); QString anchorAt(const QPointF &pos); QTextLayout layout; QTextLayout *elideLayout; QQuickTextLine *textLine; - static QPixmap drawOutline(const QPixmap &source, const QPixmap &styleSource); - static QPixmap drawOutline(const QPixmap &source, const QPixmap &styleSource, int yOffset); - static inline QQuickTextPrivate *get(QQuickText *t) { return t->d_func(); } - enum NodeType { - NodeIsNull, - NodeIsTexture, - NodeIsText - }; - NodeType nodeType; - enum UpdateType { UpdateNone, UpdatePreprocess, |