From 73187281c3f88b7a709713a2b09fb43871ea6b6d Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 4 Jan 2012 16:32:55 +0100 Subject: Fix QPainter::drawText with complex brushes Commit d52fd497f60a3c4456994f4f10e9451d611c9ea4 introduced a call path to QPaintEngineEx::drawStaticTextItem, which has a bug in using the pen's color instead of the entire brush. This patch replaces the use of the color with the pen's brush(). Task-number: QTBUG-23450 Change-Id: Ieb3bf352c840ff0d3fb4ac678caf7b13f4f9a8f1 Reviewed-by: Eskil Abrahamsen Blomfeldt --- tests/auto/gui/painting/qpainter/tst_qpainter.cpp | 24 +++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'tests/auto') diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp index 4faecad104..8451ce0696 100644 --- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp @@ -256,6 +256,8 @@ private slots: void drawTextOutsideGuiThread(); + void drawTextWithComplexBrush(); + private: void fillData(); void setPenColor(QPainter& p); @@ -4305,6 +4307,28 @@ void tst_QPainter::drawTextOutsideGuiThread() QCOMPARE(referenceRendering, t.rendering); } +void tst_QPainter::drawTextWithComplexBrush() +{ + QImage texture(10, 10, QImage::Format_ARGB32_Premultiplied); + texture.fill(Qt::red); + + QImage image(100, 100, QImage::Format_ARGB32_Premultiplied); + image.fill(Qt::white); + QPainter p(&image); + QFont f = p.font(); + f.setPixelSize(70); + p.setFont(f); + + QBrush brush(Qt::white); + brush.setTextureImage(texture); + p.setPen(QPen(brush, 2)); + + p.drawText(10, 10, "Hello World"); + + int paintedPixels = getPaintedPixels(image, Qt::white); + QVERIFY(paintedPixels > 0); +} + QTEST_MAIN(tst_QPainter) #include "tst_qpainter.moc" -- cgit v1.2.3