1 files changed, 225 insertions, 40 deletions

diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
index eb9f7529fe..46eae89024 100644
--- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp
+++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
@@ -38,6 +38,7 @@
 #include <QtQuick/private/qquicktext_p.h>
 #include <QtQuick/private/qquickmousearea_p.h>
 #include <private/qquicktext_p_p.h>
+#include <private/qquicktextdocument_p.h>
 #include <private/qquickvaluetypes_p.h>
 #include <QFontMetrics>
 #include <qmath.h>
@@ -148,6 +149,8 @@ private slots:
 
     void growFromZeroWidth();
 
+    void padding();
+
 private:
     QStringList standard;
     QStringList richText;
@@ -240,7 +243,7 @@ void tst_qquicktext::text()
 
         QVERIFY(textObject != 0);
         QCOMPARE(textObject->text(), QString(""));
-        QVERIFY(textObject->width() == 0);
+        QCOMPARE(textObject->width(), qreal(0));
 
         delete textObject;
     }
@@ -357,7 +360,7 @@ void tst_qquicktext::width()
         QVERIFY(doc != 0);
 
         QCOMPARE(int(textObject->width()), int(doc->idealWidth()));
-        QVERIFY(textObject->textFormat() == QQuickText::RichText);
+        QCOMPARE(textObject->textFormat(), QQuickText::RichText);
 
         delete textObject;
     }
@@ -374,7 +377,7 @@ void tst_qquicktext::wrap()
         textHeight = textObject->height();
 
         QVERIFY(textObject != 0);
-        QVERIFY(textObject->wrapMode() == QQuickText::WordWrap);
+        QCOMPARE(textObject->wrapMode(), QQuickText::WordWrap);
         QCOMPARE(textObject->width(), 300.);
 
         delete textObject;
@@ -657,11 +660,11 @@ void tst_qquicktext::textFormat()
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QVERIFY(textObject->textFormat() == QQuickText::RichText);
+        QCOMPARE(textObject->textFormat(), QQuickText::RichText);
 
         QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(textObject);
         QVERIFY(textPrivate != 0);
-        QVERIFY(textPrivate->richText == true);
+        QVERIFY(textPrivate->richText);
 
         delete textObject;
     }
@@ -671,11 +674,11 @@ void tst_qquicktext::textFormat()
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QVERIFY(textObject->textFormat() == QQuickText::AutoText);
+        QCOMPARE(textObject->textFormat(), QQuickText::AutoText);
 
         QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(textObject);
         QVERIFY(textPrivate != 0);
-        QVERIFY(textPrivate->styledText == true);
+        QVERIFY(textPrivate->styledText);
 
         delete textObject;
     }
@@ -685,7 +688,7 @@ void tst_qquicktext::textFormat()
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QVERIFY(textObject->textFormat() == QQuickText::PlainText);
+        QCOMPARE(textObject->textFormat(), QQuickText::PlainText);
 
         delete textObject;
     }
@@ -911,7 +914,7 @@ void tst_qquicktext::hAlignImplicitWidth()
 
     // Try to check whether alignment works by checking the number of black
     // pixels in the thirds of the grabbed image.
-    const int windowWidth = 200;
+    const int windowWidth = 220;
     const int textWidth = qCeil(text->implicitWidth());
     QVERIFY2(textWidth < windowWidth, "System font too large.");
     const int sectionWidth = textWidth / 3;
@@ -2047,8 +2050,8 @@ void tst_qquicktext::embeddedImages_data()
     QTest::newRow("local") << testFileUrl("embeddedImagesLocalRelative.qml") << "";
     QTest::newRow("remote") << testFileUrl("embeddedImagesRemote.qml") << "";
     QTest::newRow("remote-error") << testFileUrl("embeddedImagesRemoteError.qml")
-                                  << testFileUrl("embeddedImagesRemoteError.qml").toString()+":3:1: QML Text: Error downloading {{ServerBaseUrl}}/notexists.png - server replied: Not found";
-    QTest::newRow("remote") << testFileUrl("embeddedImagesRemoteRelative.qml") << "";
+                                  << testFileUrl("embeddedImagesRemoteError.qml").toString()+":3:1: QML Text: Error transferring {{ServerBaseUrl}}/notexists.png - server replied: Not found";
+    QTest::newRow("remote-relative") << testFileUrl("embeddedImagesRemoteRelative.qml") << "";
 }
 
 void tst_qquicktext::embeddedImages()
@@ -2058,6 +2061,14 @@ void tst_qquicktext::embeddedImages()
     QFETCH(QUrl, qmlfile);
     QFETCH(QString, error);
 
+#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
+    if (qstrcmp(QTest::currentDataTag(), "remote") == 0
+        || qstrcmp(QTest::currentDataTag(), "remote-error") == 0
+        || qstrcmp(QTest::currentDataTag(), "remote-relative") == 0) {
+        QSKIP("Remote tests cause occasional hangs in the CI system -- QTBUG-45655");
+    }
+#endif
+
     TestHTTPServer server;
     QVERIFY2(server.listen(), qPrintable(server.errorString()));
     server.serveDirectory(testFile("http"));
@@ -2126,8 +2137,8 @@ void tst_qquicktext::lineHeight()
     QQuickText *myText = window->rootObject()->findChild<QQuickText*>("myText");
     QVERIFY(myText != 0);
 
-    QVERIFY(myText->lineHeight() == 1);
-    QVERIFY(myText->lineHeightMode() == QQuickText::ProportionalHeight);
+    QCOMPARE(myText->lineHeight(), qreal(1));
+    QCOMPARE(myText->lineHeightMode(), QQuickText::ProportionalHeight);
 
     qreal h = myText->height();
     myText->setLineHeight(1.5);
@@ -2197,12 +2208,12 @@ void tst_qquicktext::implicitSize()
     QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
     QVERIFY(textObject->width() < textObject->implicitWidth());
-    QVERIFY(textObject->height() == textObject->implicitHeight());
+    QCOMPARE(textObject->height(), textObject->implicitHeight());
     QCOMPARE(textObject->property("iWidth").toReal(), textObject->implicitWidth());
 
     textObject->resetWidth();
-    QVERIFY(textObject->width() == textObject->implicitWidth());
-    QVERIFY(textObject->height() == textObject->implicitHeight());
+    QCOMPARE(textObject->width(), textObject->implicitWidth());
+    QCOMPARE(textObject->height(), textObject->implicitHeight());
 
     delete textObject;
 }
@@ -2738,7 +2749,7 @@ void tst_qquicktext::lineLaidOut()
             QVERIFY(r.x() == r.width() + 30);
         if (i >= 60) {
             QVERIFY(r.x() == r.width() * 2 + 60);
-            QVERIFY(r.height() == 20);
+            QCOMPARE(r.height(), qreal(20));
         }
     }
 
@@ -2916,7 +2927,7 @@ void tst_qquicktext::imgTagsAlign()
     QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
     QVERIFY(textObject != 0);
-    QVERIFY(textObject->height() == imgHeight);
+    QCOMPARE(textObject->height(), qreal(imgHeight));
 
     QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(textObject);
     QVERIFY(textPrivate != 0);
@@ -2927,7 +2938,7 @@ void tst_qquicktext::imgTagsAlign()
     else if (align == "middle")
         QVERIFY(br.y() == imgHeight / 2.0 - br.height() / 2.0);
     else if (align == "top")
-        QVERIFY(br.y() == 0);
+        QCOMPARE(br.y(), qreal(0));
 
     delete textObject;
 }
@@ -2941,11 +2952,11 @@ void tst_qquicktext::imgTagsMultipleImages()
     QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
     QVERIFY(textObject != 0);
-    QVERIFY(textObject->height() == 85);
+    QCOMPARE(textObject->height(), qreal(85));
 
     QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(textObject);
     QVERIFY(textPrivate != 0);
-    QVERIFY(textPrivate->extra->visibleImgTags.count() == 2);
+    QCOMPARE(textPrivate->extra->visibleImgTags.count(), 2);
 
     delete textObject;
 }
@@ -2958,9 +2969,9 @@ void tst_qquicktext::imgTagsElide()
 
     QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(myText);
     QVERIFY(textPrivate != 0);
-    QVERIFY(textPrivate->extra->visibleImgTags.count() == 0);
+    QCOMPARE(textPrivate->extra->visibleImgTags.count(), 0);
     myText->setMaximumLineCount(20);
-    QTRY_VERIFY(textPrivate->extra->visibleImgTags.count() == 1);
+    QTRY_COMPARE(textPrivate->extra->visibleImgTags.count(), 1);
 
     delete myText;
     delete window;
@@ -2978,16 +2989,16 @@ void tst_qquicktext::imgTagsUpdates()
     QVERIFY(textPrivate != 0);
 
     myText->setText("This is a heart<img src=\"images/heart200.png\">.");
-    QVERIFY(textPrivate->extra->visibleImgTags.count() == 1);
-    QVERIFY(spy.count() == 1);
+    QCOMPARE(textPrivate->extra->visibleImgTags.count(), 1);
+    QCOMPARE(spy.count(), 1);
 
     myText->setMaximumLineCount(2);
     myText->setText("This is another heart<img src=\"images/heart200.png\">.");
-    QTRY_VERIFY(textPrivate->extra->visibleImgTags.count() == 1);
+    QTRY_COMPARE(textPrivate->extra->visibleImgTags.count(), 1);
 
     // if maximumLineCount is set and the img tag doesn't have an explicit size
     // we relayout twice.
-    QVERIFY(spy.count() == 3);
+    QCOMPARE(spy.count(), 3);
 
     delete myText;
     delete window;
@@ -3634,19 +3645,19 @@ Q_DECLARE_METATYPE(ExpectedBaseline)
 static qreal expectedBaselineTop(QQuickText *item)
 {
     QFontMetricsF fm(item->font());
-    return fm.ascent();
+    return fm.ascent() + item->topPadding();
 }
 
 static qreal expectedBaselineBottom(QQuickText *item)
 {
     QFontMetricsF fm(item->font());
-    return item->height() - item->contentHeight() + fm.ascent();
+    return item->height() - item->contentHeight() - item->bottomPadding() + fm.ascent();
 }
 
 static qreal expectedBaselineCenter(QQuickText *item)
 {
     QFontMetricsF fm(item->font());
-    return ((item->height() - item->contentHeight()) / 2) + fm.ascent();
+    return ((item->height() - item->contentHeight() - item->topPadding() - item->bottomPadding()) / 2) + fm.ascent() + item->topPadding();
 }
 
 static qreal expectedBaselineBold(QQuickText *item)
@@ -3654,7 +3665,7 @@ static qreal expectedBaselineBold(QQuickText *item)
     QFont font = item->font();
     font.setBold(true);
     QFontMetricsF fm(font);
-    return fm.ascent();
+    return fm.ascent() + item->topPadding();
 }
 
 static qreal expectedBaselineImage(QQuickText *item)
@@ -3664,13 +3675,13 @@ static qreal expectedBaselineImage(QQuickText *item)
     // or image height - line height and the baseline is line position + ascent.  Because
     // QTextLine's height is rounded up this can give slightly different results to image height
     // - descent.
-    return 181 - qCeil(fm.height()) + fm.ascent();
+    return 181 - qCeil(fm.height()) + fm.ascent() + item->topPadding();
 }
 
 static qreal expectedBaselineCustom(QQuickText *item)
 {
     QFontMetricsF fm(item->font());
-    return 16 + fm.ascent();
+    return 16 + fm.ascent() + item->topPadding();
 }
 
 static qreal expectedBaselineScaled(QQuickText *item)
@@ -3689,11 +3700,11 @@ static qreal expectedBaselineScaled(QQuickText *item)
 
         if (width < item->width()) {
             QFontMetricsF fm(layout.font());
-            return fm.ascent();
+            return fm.ascent() + item->topPadding();
         }
         font.setPointSize(font.pointSize() - 1);
     } while (font.pointSize() > 0);
-    return 0;
+    return item->topPadding();
 }
 
 static qreal expectedBaselineFixedBottom(QQuickText *item)
@@ -3702,7 +3713,7 @@ static qreal expectedBaselineFixedBottom(QQuickText *item)
     qreal dy = item->text().contains(QLatin1Char('\n'))
             ? 160
             : 180;
-    return dy + fm.ascent();
+    return dy + fm.ascent() - item->bottomPadding();
 }
 
 static qreal expectedBaselineProportionalBottom(QQuickText *item)
@@ -3711,7 +3722,7 @@ static qreal expectedBaselineProportionalBottom(QQuickText *item)
     qreal dy = item->text().contains(QLatin1Char('\n'))
             ? 200 - (qCeil(fm.height()) * 3)
             : 200 - (qCeil(fm.height()) * 1.5);
-    return dy + fm.ascent();
+    return dy + fm.ascent() - item->bottomPadding();
 }
 
 void tst_qquicktext::baselineOffset_data()
@@ -3746,8 +3757,8 @@ void tst_qquicktext::baselineOffset_data()
             << "<b>hello world</b>"
             << "<b>hello<br/>world</b>"
             << QByteArray("height: 200")
-            << &expectedBaselineTop
-            << &expectedBaselineBold;
+            << &expectedBaselineBold
+            << &expectedBaselineTop;
 
     QTest::newRow("richText")
             << "<b>hello world</b>"
@@ -3818,6 +3829,102 @@ void tst_qquicktext::baselineOffset_data()
             << QByteArray("height: 200; lineHeightMode: Text.ProportionalHeight; lineHeight: 1.5; verticalAlignment: Text.AlignBottom")
             << &expectedBaselineProportionalBottom
             << &expectedBaselineProportionalBottom;
+
+    QTest::newRow("top align with padding")
+            << "hello world"
+            << "hello\nworld"
+            << QByteArray("height: 200; topPadding: 10; bottomPadding: 20; verticalAlignment: Text.AlignTop")
+            << &expectedBaselineTop
+            << &expectedBaselineTop;
+    QTest::newRow("bottom align with padding")
+            << "hello world"
+            << "hello\nworld"
+            << QByteArray("height: 200; topPadding: 10; bottomPadding: 20; verticalAlignment: Text.AlignBottom")
+            << &expectedBaselineBottom
+            << &expectedBaselineBottom;
+    QTest::newRow("center align with padding")
+            << "hello world"
+            << "hello\nworld"
+            << QByteArray("height: 200; topPadding: 10; bottomPadding: 20; verticalAlignment: Text.AlignVCenter")
+            << &expectedBaselineCenter
+            << &expectedBaselineCenter;
+
+    QTest::newRow("bold width padding")
+            << "<b>hello world</b>"
+            << "<b>hello<br/>world</b>"
+            << QByteArray("height: 200; topPadding: 10; bottomPadding: 20")
+            << &expectedBaselineBold
+            << &expectedBaselineTop;
+
+    QTest::newRow("richText with padding")
+            << "<b>hello world</b>"
+            << "<b>hello<br/>world</b>"
+            << QByteArray("height: 200; topPadding: 10; bottomPadding: 20; textFormat: Text.RichText")
+            << &expectedBaselineTop
+            << &expectedBaselineTop;
+
+    QTest::newRow("elided with padding")
+            << "hello world"
+            << "hello\nworld"
+            << QByteArray("width: 20; height: 8; topPadding: 10; bottomPadding: 20; elide: Text.ElideRight")
+            << &expectedBaselineTop
+            << &expectedBaselineTop;
+
+    QTest::newRow("elided bottom align with padding")
+            << "hello world"
+            << "hello\nworld!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+            << QByteArray("width: 200; height: 200; topPadding: 10; bottomPadding: 20; elide: Text.ElideRight; verticalAlignment: Text.AlignBottom")
+            << &expectedBaselineBottom
+            << &expectedBaselineBottom;
+
+    QTest::newRow("image with padding")
+            << "hello <img src=\"images/heart200.png\" /> world"
+            << "hello <img src=\"images/heart200.png\" /><br/>world"
+            << QByteArray("height: 200\n; topPadding: 10; bottomPadding: 20; baseUrl: \"") + testFileUrl("reference").toEncoded() + QByteArray("\"")
+            << &expectedBaselineImage
+            << &expectedBaselineTop;
+
+    QTest::newRow("customLine with padding")
+            << "hello world"
+            << "hello\nworld"
+            << QByteArray("height: 200; topPadding: 10; bottomPadding: 20; onLineLaidOut: line.y += 16")
+            << &expectedBaselineCustom
+            << &expectedBaselineCustom;
+
+    QTest::newRow("scaled font with padding")
+            << "hello world"
+            << "hello\nworld"
+            << QByteArray("width: 200; topPadding: 10; bottomPadding: 20; minimumPointSize: 1; font.pointSize: 64; fontSizeMode: Text.HorizontalFit")
+            << &expectedBaselineScaled
+            << &expectedBaselineTop;
+
+    QTest::newRow("fixed line height top align with padding")
+            << "hello world"
+            << "hello\nworld"
+            << QByteArray("height: 200; topPadding: 10; bottomPadding: 20; lineHeightMode: Text.FixedHeight; lineHeight: 20; verticalAlignment: Text.AlignTop")
+            << &expectedBaselineTop
+            << &expectedBaselineTop;
+
+    QTest::newRow("fixed line height bottom align with padding")
+            << "hello world"
+            << "hello\nworld"
+            << QByteArray("height: 200; topPadding: 10; bottomPadding: 20; lineHeightMode: Text.FixedHeight; lineHeight: 20; verticalAlignment: Text.AlignBottom")
+            << &expectedBaselineFixedBottom
+            << &expectedBaselineFixedBottom;
+
+    QTest::newRow("proportional line height top align with padding")
+            << "hello world"
+            << "hello\nworld"
+            << QByteArray("height: 200; topPadding: 10; bottomPadding: 20; lineHeightMode: Text.ProportionalHeight; lineHeight: 1.5; verticalAlignment: Text.AlignTop")
+            << &expectedBaselineTop
+            << &expectedBaselineTop;
+
+    QTest::newRow("proportional line height bottom align with padding")
+            << "hello world"
+            << "hello\nworld"
+            << QByteArray("height: 200; topPadding: 10; bottomPadding: 20; lineHeightMode: Text.ProportionalHeight; lineHeight: 1.5; verticalAlignment: Text.AlignBottom")
+            << &expectedBaselineProportionalBottom
+            << &expectedBaselineProportionalBottom;
 }
 
 void tst_qquicktext::baselineOffset()
@@ -3830,7 +3937,7 @@ void tst_qquicktext::baselineOffset()
 
     QQmlComponent component(&engine);
     component.setData(
-            "import QtQuick 2.0\n"
+            "import QtQuick 2.6\n"
             "Text {\n"
                 + bindings + "\n"
             "}", QUrl());
@@ -3972,6 +4079,84 @@ void tst_qquicktext::growFromZeroWidth()
     QVERIFY(text->lineCount() > 3);
 }
 
+void tst_qquicktext::padding()
+{
+    QScopedPointer<QQuickView> window(new QQuickView);
+    window->setSource(testFileUrl("padding.qml"));
+    QTRY_COMPARE(window->status(), QQuickView::Ready);
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
+    QQuickItem *root = window->rootObject();
+    QVERIFY(root);
+    QQuickText *obj = qobject_cast<QQuickText*>(root);
+    QVERIFY(obj != 0);
+
+    qreal cw = obj->contentWidth();
+    qreal ch = obj->contentHeight();
+
+    QVERIFY(cw > 0);
+    QVERIFY(ch > 0);
+
+    QCOMPARE(obj->topPadding(), 20.0);
+    QCOMPARE(obj->leftPadding(), 30.0);
+    QCOMPARE(obj->rightPadding(), 40.0);
+    QCOMPARE(obj->bottomPadding(), 50.0);
+
+    QCOMPARE(obj->implicitWidth(), cw + obj->leftPadding() + obj->rightPadding());
+    QCOMPARE(obj->implicitHeight(), ch + obj->topPadding() + obj->bottomPadding());
+
+    obj->setTopPadding(2.25);
+    QCOMPARE(obj->topPadding(), 2.25);
+    QCOMPARE(obj->implicitHeight(), ch + obj->topPadding() + obj->bottomPadding());
+
+    obj->setLeftPadding(3.75);
+    QCOMPARE(obj->leftPadding(), 3.75);
+    QCOMPARE(obj->implicitWidth(), cw + obj->leftPadding() + obj->rightPadding());
+
+    obj->setRightPadding(4.4);
+    QCOMPARE(obj->rightPadding(), 4.4);
+    QCOMPARE(obj->implicitWidth(), cw + obj->leftPadding() + obj->rightPadding());
+
+    obj->setBottomPadding(1.11);
+    QCOMPARE(obj->bottomPadding(), 1.11);
+    QCOMPARE(obj->implicitHeight(), ch + obj->topPadding() + obj->bottomPadding());
+
+    obj->setText("Qt");
+    QVERIFY(obj->contentWidth() < cw);
+    QCOMPARE(obj->contentHeight(), ch);
+    cw = obj->contentWidth();
+
+    QCOMPARE(obj->implicitWidth(), cw + obj->leftPadding() + obj->rightPadding());
+    QCOMPARE(obj->implicitHeight(), ch + obj->topPadding() + obj->bottomPadding());
+
+    obj->setFont(QFont("Courier", 96));
+    QVERIFY(obj->contentWidth() > cw);
+    QVERIFY(obj->contentHeight() > ch);
+    cw = obj->contentWidth();
+    ch = obj->contentHeight();
+
+    QCOMPARE(obj->implicitWidth(), cw + obj->leftPadding() + obj->rightPadding());
+    QCOMPARE(obj->implicitHeight(), ch + obj->topPadding() + obj->bottomPadding());
+
+    obj->resetTopPadding();
+    QCOMPARE(obj->topPadding(), 10.0);
+    obj->resetLeftPadding();
+    QCOMPARE(obj->leftPadding(), 10.0);
+    obj->resetRightPadding();
+    QCOMPARE(obj->rightPadding(), 10.0);
+    obj->resetBottomPadding();
+    QCOMPARE(obj->bottomPadding(), 10.0);
+
+    obj->resetPadding();
+    QCOMPARE(obj->padding(), 0.0);
+    QCOMPARE(obj->topPadding(), 0.0);
+    QCOMPARE(obj->leftPadding(), 0.0);
+    QCOMPARE(obj->rightPadding(), 0.0);
+    QCOMPARE(obj->bottomPadding(), 0.0);
+
+    delete root;
+}
+
 QTEST_MAIN(tst_qquicktext)
 
 #include "tst_qquicktext.moc"