Change QStaticText::setMaximumSize() to setTextWidth()

To avoid having to precalculate the height of the laid out text, we
now only supply a maximum text width to QStaticText. The only usage of
the maximum height would be to clip the results, and clipping should be
set separately from the QStaticText call, since this has no impact on
the layout of the glyphs. The tests have been updated to reflect the
change in logic.

We also need a consistent way of specifying the position of the text.
Before, the position meant "baseline position" for unbroken text and
"top left position" for text with a specified layout width. We want
to be consistent, and since baseline position makes no sense for
multiline text, we standardize on top left position.

Task-number: QTBUG-9029
Reviewed-by: Gunnar

1 files changed, 32 insertions, 19 deletions

diff --git a/tests/auto/qstatictext/tst_qstatictext.cpp b/tests/auto/qstatictext/tst_qstatictext.cpp
index b59c10b..4e2d906 100644
--- a/tests/auto/qstatictext/tst_qstatictext.cpp
+++ b/tests/auto/qstatictext/tst_qstatictext.cpp
@@ -50,7 +50,7 @@
 #include <private/qstatictext_p.h>
 #include <private/qapplication_p.h>
 
-// #define DEBUG_SAVE_IMAGE
+#define DEBUG_SAVE_IMAGE
 
 class tst_QStaticText: public QObject
 {
@@ -69,7 +69,7 @@ private slots:
     void drawToRect_data();
     void drawToRect();
     void setFont();
-    void setMaximumSize();
+    void setTextWidth();
     void prepareToCorrectData();
     void prepareToWrongData();
 
@@ -127,7 +127,7 @@ void tst_QStaticText::drawToPoint()
         QStaticText text("Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
         text.setTextFormat(Qt::PlainText);
         text.setPerformanceHint(performanceHint);
-        p.drawStaticText(QPointF(11, 12), text);
+        p.drawStaticText(QPointF(11, 12 - QFontMetricsF(p.font()).ascent()), text);
     }
 
     QCOMPARE(imageDrawStaticText, imageDrawText);
@@ -156,12 +156,19 @@ void tst_QStaticText::drawToRect()
     imageDrawStaticText.fill(Qt::white);
     {
         QPainter p(&imageDrawStaticText);
-        QStaticText text("Lorem ipsum dolor sit amet, consectetur adipiscing elit.", QSizeF(10, 500));
+        QStaticText text("Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
+        text.setTextWidth(10),
+        p.setClipRect(QRectF(11, 12, 10, 500));
         text.setPerformanceHint(performanceHint);
         text.setTextFormat(Qt::PlainText);
         p.drawStaticText(QPointF(11, 12), text);
     }
 
+#if defined(DEBUG_SAVE_IMAGE)
+    imageDrawText.save("drawToRect_imageDrawText.png");
+    imageDrawStaticText.save("drawToRect_imageDrawStaticText.png");
+#endif
+
     QCOMPARE(imageDrawStaticText, imageDrawText);   
 }
 
@@ -187,7 +194,7 @@ void tst_QStaticText::prepareToCorrectData()
         QStaticText text("Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
         text.prepare(transform, p.font());
         text.setTextFormat(Qt::PlainText);
-        p.drawStaticText(QPointF(11, 12), text);
+        p.drawStaticText(QPointF(11, 12  - QFontMetricsF(p.font()).ascent()), text);
     }
 
     if (!supportsTransformations())
@@ -215,7 +222,7 @@ void tst_QStaticText::prepareToWrongData()
         QStaticText text("Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
         text.prepare(transform, p.font());
         text.setTextFormat(Qt::PlainText);
-        p.drawStaticText(QPointF(11, 12), text);
+        p.drawStaticText(QPointF(11, 12  - QFontMetricsF(p.font()).ascent()), text);
     }
 
     QCOMPARE(imageDrawStaticText, imageDrawText);
@@ -232,10 +239,10 @@ void tst_QStaticText::setFont()
     imageDrawText.fill(Qt::white);
     {
         QPainter p(&imageDrawText);
-        p.drawText(0, 0, "Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
+        p.drawText(0, 0 + QFontMetrics(p.font()).ascent(), "Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
 
         p.setFont(font);
-        p.drawText(11, 120, "Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
+        p.drawText(11, 120 + QFontMetrics(p.font()).ascent(), "Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
     }
 
     QPixmap imageDrawStaticText(1000, 1000);
@@ -253,10 +260,15 @@ void tst_QStaticText::setFont()
         p.drawStaticText(11, 120, text);
     }
 
+#if defined(DEBUG_SAVE_IMAGE)
+    imageDrawText.save("setFont_imageDrawText.png");
+    imageDrawStaticText.save("setFont_imageDrawStaticText.png");
+#endif
+
     QCOMPARE(imageDrawStaticText, imageDrawText);
 }
 
-void tst_QStaticText::setMaximumSize()
+void tst_QStaticText::setTextWidth()
 {
     QPixmap imageDrawText(1000, 1000);
     imageDrawText.fill(Qt::white);
@@ -270,7 +282,8 @@ void tst_QStaticText::setMaximumSize()
     {
         QPainter p(&imageDrawStaticText);
         QStaticText text("Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
-        text.setMaximumSize(QSizeF(10, 500));
+        text.setTextWidth(10);
+        p.setClipRect(QRectF(11, 12, 10, 500));
         p.drawStaticText(QPointF(11, 12), text);
     }
 
@@ -297,7 +310,7 @@ void tst_QStaticText::translatedPainter()
         QStaticText text("Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
         text.setTextFormat(Qt::PlainText);
 
-        p.drawStaticText(QPointF(11, 12), text);
+        p.drawStaticText(QPointF(11, 12 - QFontMetricsF(p.font()).ascent()), text);
     }
 
     QCOMPARE(imageDrawStaticText, imageDrawText);
@@ -329,7 +342,7 @@ void tst_QStaticText::rotatedPainter()
     {
         QPainter p(&imageDrawText);
         p.rotate(30.0);
-        p.drawText(0, 0, "Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
+        p.drawText(0, 0 + QFontMetricsF(p.font()).ascent(), "Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
     }
 
     QPixmap imageDrawStaticText(1000, 1000);
@@ -373,7 +386,7 @@ void tst_QStaticText::scaledPainter()
         QStaticText text("Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
         text.setTextFormat(Qt::PlainText);
 
-        p.drawStaticText(QPointF(11, 12), text);
+        p.drawStaticText(QPointF(11, 12 - QFontMetricsF(p.font()).ascent()), text);
     }
 
     if (!supportsTransformations())
@@ -404,7 +417,7 @@ void tst_QStaticText::projectedPainter()
         QStaticText text("Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
         text.setTextFormat(Qt::PlainText);
 
-        p.drawStaticText(QPointF(11, 12), text);
+        p.drawStaticText(QPointF(11, 12 - QFontMetricsF(p.font()).ascent()), text);
     }
 
     QCOMPARE(imageDrawStaticText, imageDrawText);
@@ -434,7 +447,7 @@ void tst_QStaticText::rotatedScaledAndTranslatedPainter()
         QStaticText text("Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
         text.setTextFormat(Qt::PlainText);
 
-        p.drawStaticText(QPointF(11, 12), text);
+        p.drawStaticText(QPointF(11, 12 - QFontMetricsF(p.font()).ascent()), text);
     }
 
 #if defined(DEBUG_SAVE_IMAGE)
@@ -456,10 +469,10 @@ void tst_QStaticText::transformationChanged()
         p.rotate(33.0);
         p.scale(0.5, 0.7);
 
-        p.drawText(0, 0, "Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
+        p.drawText(0, 0 + QFontMetricsF(p.font()).ascent(), "Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
 
         p.scale(7.0, 5.0);
-        p.drawText(0, 0, "Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
+        p.drawText(0, 0 + QFontMetricsF(p.font()).ascent(), "Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
     }
 
     QPixmap imageDrawStaticText(1000, 1000);
@@ -566,7 +579,7 @@ void tst_QStaticText::setPenRichText()
         QStaticText staticText;
         staticText.setText("<html><body>XXXXX</body></html>");
         staticText.setTextFormat(Qt::RichText);
-        p.drawStaticText(0, fm.ascent(), staticText);
+        p.drawStaticText(0, 0, staticText);
     }
 
     QImage img = image.toImage();
@@ -595,7 +608,7 @@ void tst_QStaticText::richTextOverridesPen()
         QStaticText staticText;
         staticText.setText("<html><body><font color=\"#ff0000\">XXXXX</font></body></html>");
         staticText.setTextFormat(Qt::RichText);
-        p.drawStaticText(0, fm.ascent(), staticText);
+        p.drawStaticText(0, 0, staticText);
     }
 
     QImage img = image.toImage();