FCL/sf/mw/qt: comparison tests/auto/qpainter/tst

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 **
 ****************************************************************************/
 #include <QtTest/QtTest>
+#include "../../shared/util.h"
 #include <qpainter.h>
 #include <qapplication.h>
 #include <qwidget.h>
 #include <qfontmetrics.h>
 #include <qlabel.h>
 #include <qqueue.h>
+#include <qgraphicsview.h>
+#include <qgraphicsscene.h>
+#include <qgraphicsproxywidget.h>
+#include <qlayout.h>
 #if defined(Q_OS_SYMBIAN)
 # define SRCDIR "."
 #endif
 Q_DECLARE_METATYPE(QLine)
 void drawPixmap_comp_data();
 void drawPixmap_comp();
 void saveAndRestore_data();
 void saveAndRestore();
+void drawBorderPixmap();
 void drawLine_data();
 void drawLine();
 void drawLine_clipped();
 void drawLine_task121143();
 void drawLine_task216948();
 void emptyClip();
 void taskQT4444_dontOverflowDashOffset();
 void painterBegin();
+void setPenColorOnImage();
+void setPenColorOnPixmap();
+void QTBUG5939_attachPainterPrivate();
 private:
 void fillData();
+void setPenColor(QPainter& p);
 QColor baseColor( int k, int intensity=255 );
 QImage getResImage( const QString &dir, const QString &addition, const QString &extension );
 QBitmap getBitmap( const QString &dir, const QString &filename, bool mask );
 };
 QCOMPARE(p.background(), pal.background());
 delete widget;
 }
+void tst_QPainter::drawBorderPixmap()
+{
+QPixmap src(79,79);
+src.fill(Qt::transparent);
+QImage pm(200,200,QImage::Format_RGB32);
+QPainter p(&pm);
+p.setTransform(QTransform(-1,0,0,-1,173.5,153.5));
+qDrawBorderPixmap(&p, QRect(0,0,75,105), QMargins(39,39,39,39), src, QRect(0,0,79,79), QMargins(39,39,39,39),
+QTileRules(Qt::StretchTile,Qt::StretchTile), 0);
+}
 void tst_QPainter::drawLine_data()
 {
 QTest::addColumn<QLine>("line");
 QTest::newRow("0-45") << QLine(0, 20, 100, 0);
 if (format == QImage::Format_Indexed8)
 continue;
 QImage img(2, 2, format);
-if (img.numColors() > 0) {
+if (img.colorCount() > 0) {
 img.setColor(0, QColor(colorPairs[j][0]).rgba());
 img.setColor(1, QColor(colorPairs[j][1]).rgba());
 }
 img.fill(0x0);
 // drawing a transparent image on top of another image
 // should not change the image
 QCOMPARE(original, img);
-if (img.numColors() == 0)
+if (img.colorCount() == 0)
 continue;
 for (int k = 0; k < 2; ++k) {
 QPainter p(&img);
 p.fillRect(0, 0, 2, 2, colorPairs[j][k]);
 QVERIFY(testCompositionMode( 63,  63,  31, QPainter::CompositionMode_HardLight));
 QVERIFY(testCompositionMode(127,  63,  63, QPainter::CompositionMode_HardLight));
 QVERIFY(testCompositionMode(255, 255, 255, QPainter::CompositionMode_SoftLight));
 QVERIFY(testCompositionMode(  0,   0,   0, QPainter::CompositionMode_SoftLight));
-QVERIFY(testCompositionMode(127, 127, 127, QPainter::CompositionMode_SoftLight));
+QVERIFY(testCompositionMode(127, 127, 126, QPainter::CompositionMode_SoftLight));
-QVERIFY(testCompositionMode( 63,  63,  86, QPainter::CompositionMode_SoftLight));
+QVERIFY(testCompositionMode( 63,  63,  39, QPainter::CompositionMode_SoftLight));
-QVERIFY(testCompositionMode(127,  63,  63, QPainter::CompositionMode_SoftLight));
+QVERIFY(testCompositionMode(127,  63,  62, QPainter::CompositionMode_SoftLight));
 QVERIFY(testCompositionMode(255, 255,   0, QPainter::CompositionMode_Difference));
 QVERIFY(testCompositionMode(  0,   0,   0, QPainter::CompositionMode_Difference));
 QVERIFY(testCompositionMode(255,   0, 255, QPainter::CompositionMode_Difference));
 QVERIFY(testCompositionMode(127, 127,   0, QPainter::CompositionMode_Difference));
 // Try ending an inactive painter.
 QVERIFY(!p.end());
 }
+void tst_QPainter::setPenColor(QPainter& p)
+{
+p.setPen(Qt::NoPen);
+// Setting color, then style
+// Should work even though the pen is "NoPen with color", temporarily.
+QPen newPen(p.pen());
+newPen.setColor(Qt::red);
+QCOMPARE(p.pen().style(), newPen.style());
+QCOMPARE(p.pen().style(), Qt::NoPen);
+p.setPen(newPen);
+QCOMPARE(p.pen().color().name(), QString("#ff0000"));
+QPen newPen2(p.pen());
+newPen2.setStyle(Qt::SolidLine);
+p.setPen(newPen2);
+QCOMPARE(p.pen().color().name(), QString("#ff0000"));
+}
+void tst_QPainter::setPenColorOnImage()
+{
+QImage img(QSize(10, 10), QImage::Format_ARGB32_Premultiplied);
+QPainter p(&img);
+setPenColor(p);
+}
+void tst_QPainter::setPenColorOnPixmap()
+{
+QPixmap pix(10, 10);
+QPainter p(&pix);
+setPenColor(p);
+}
+class TestProxy : public QGraphicsProxyWidget
+{
+public:
+TestProxy() : QGraphicsProxyWidget() {}
+void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+QGraphicsProxyWidget::paint(painter, option, widget);
+deviceTransform = painter->deviceTransform();
+}
+QTransform deviceTransform;
+};
+class TestWidget : public QWidget
+{
+Q_OBJECT
+public:
+TestWidget() : QWidget(), painted(false) {}
+void paintEvent(QPaintEvent *)
+{
+QPainter p(this);
+deviceTransform = p.deviceTransform();
+worldTransform = p.worldTransform();
+painted = true;
+}
+QTransform deviceTransform;
+QTransform worldTransform;
+bool painted;
+};
+void tst_QPainter::QTBUG5939_attachPainterPrivate()
+{
+QWidget *w = new QWidget();
+QGraphicsScene *scene = new QGraphicsScene();
+QGraphicsView *view = new QGraphicsView(scene, w);
+view->move(50 ,50);
+TestProxy *proxy = new TestProxy();
+TestWidget *widget = new TestWidget();
+proxy->setWidget(widget);
+scene->addItem(proxy);
+proxy->rotate(45);
+w->resize(scene->sceneRect().size().toSize());
+w->show();
+QTRY_VERIFY(widget->painted);
+QVERIFY(widget->worldTransform.isIdentity());
+QCOMPARE(widget->deviceTransform, proxy->deviceTransform);
+}
 QTEST_MAIN(tst_QPainter)
 #include "tst_qpainter.moc"

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7
child 7	f7bc934e204c