Add support for resizing fonts to fit Text dimensions.

This adds a mode where if the content of a Text item doesn't fit
within its bounds the font size is reduced during layout until it
does or a minimum font size is reached.

Task-number: QTBUG-22832
Change-Id: I6198ef03899e2f21b32e313548966ef4b0e3bff1
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/src/quick/items/qquicktext_p_p.h b/src/quick/items/qquicktext_p_p.h
index e7b0478e21..7585026df8 100644
--- a/src/quick/items/qquicktext_p_p.h
+++ b/src/quick/items/qquicktext_p_p.h
@@ -103,9 +103,12 @@ public:
     int lineCount;
     int maximumLineCount;
     int maximumLineCountValid;
+    QQuickText::FontSizeMode fontSizeMode;
+    int minimumPixelSize;
+    int minimumPointSize;
     QPointF elidePos;
 
-    static QString elideChar;
+    static const QChar elideChar;
 
     void markDirty();
     bool invalidateImageCache();
@@ -115,6 +118,7 @@ public:
 
     bool imageCacheDirty:1;
     bool updateOnComponentComplete:1;
+    bool updateLayoutOnPolish:1;
     bool richText:1;
     bool styledText:1;
     bool singleline:1;
@@ -141,13 +145,13 @@ public:
     QQuickTextDocumentWithImageResources *doc;
 
     QRect setupTextLayout();
-    void setupCustomLineGeometry(QTextLine &line, qreal &height, qreal elideWidth);
+    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 *elipsisLayout;
+    QTextLayout *elideLayout;
     QQuickTextLine *textLine;
 
     static QPixmap drawOutline(const QPixmap &source, const QPixmap &styleSource);