From 72aaba336c7afe6d79d59995bfb31a8effca4e9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Thu, 20 Sep 2012 15:30:24 +0200 Subject: Fixed inconsistent rounding of square cap pens. A horizontal line should round up at the same time as a vertical line with square cap, when rendering at subpixel coordinates. Thus, the special casing in the cosmetic stroker of offsetting by half a pixel should be for flat caps instead of for square caps. Task-number: QTBUG-26013 Change-Id: Ic09249337f814c7de95a17976ec9e651561a744b Reviewed-by: Lars Knoll --- tests/auto/gui/painting/qpainter/tst_qpainter.cpp | 29 +++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'tests/auto/gui/painting') diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp index 14e83adfd0..029bbb8df3 100644 --- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp @@ -278,6 +278,7 @@ private slots: void drawTextOutsideGuiThread(); void drawTextWithComplexBrush(); + void QTBUG26013_squareCapStroke(); private: void fillData(); @@ -4361,6 +4362,34 @@ void tst_QPainter::drawTextWithComplexBrush() QVERIFY(paintedPixels > 0); } +void tst_QPainter::QTBUG26013_squareCapStroke() +{ + QImage image(4, 4, QImage::Format_RGB32); + + QPainter p(&image); + p.setPen(QPen(Qt::black, 0, Qt::SolidLine, Qt::SquareCap)); + + for (int i = 0; i < 3; ++i) { + qreal d = i / 3.0; + + image.fill(0xffffffff); + + p.drawLine(QLineF(0, d, 0, d + 2)); + p.drawLine(QLineF(1, d, 3, d)); + + // ensure that a horizontal line and a vertical line with square cap round up (downwards) at the same time + QCOMPARE(image.pixel(0, 0), image.pixel(1, 0)); + + image.fill(0xffffffff); + + p.drawLine(QLineF(d, 0, d + 2, 0)); + p.drawLine(QLineF(d, 1, d, 3)); + + // ensure that a vertical line and a horizontal line with square cap round up (to the right) at the same time + QCOMPARE(image.pixel(0, 0), image.pixel(0, 1)); + } +} + QTEST_MAIN(tst_QPainter) #include "tst_qpainter.moc" -- cgit v1.2.3