summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qpaintengineex.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/painting/qpaintengineex.cpp')
-rw-r--r--src/gui/painting/qpaintengineex.cpp19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp
index 4f2fffa..ad486ba 100644
--- a/src/gui/painting/qpaintengineex.cpp
+++ b/src/gui/painting/qpaintengineex.cpp
@@ -970,23 +970,26 @@ void QPaintEngineEx::drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, con
fill(path, brush);
}
-void QPaintEngineEx::drawPixmaps(const QDrawPixmaps::Data *drawingData, int dataCount, const QPixmap &pixmap, QDrawPixmaps::DrawingHints /*hints*/)
+void QPaintEngineEx::drawPixmapFragments(const QPainter::Fragment *fragments, int fragmentCount,
+ const QPixmap &pixmap, QPainter::FragmentHints /*hints*/)
{
qreal oldOpacity = state()->opacity;
QTransform oldTransform = state()->matrix;
- for (int i = 0; i < dataCount; ++i) {
+ for (int i = 0; i < fragmentCount; ++i) {
QTransform transform = oldTransform;
- transform.translate(drawingData[i].point.x(), drawingData[i].point.y());
- transform.rotate(drawingData[i].rotation);
- state()->opacity = oldOpacity * drawingData[i].opacity;
+ transform.translate(fragments[i].x, fragments[i].y);
+ transform.rotate(fragments[i].rotation);
+ state()->opacity = oldOpacity * fragments[i].opacity;
state()->matrix = transform;
opacityChanged();
transformChanged();
- qreal w = drawingData[i].scaleX * drawingData[i].source.width();
- qreal h = drawingData[i].scaleY * drawingData[i].source.height();
- drawPixmap(QRectF(-0.5 * w, -0.5 * h, w, h), pixmap, drawingData[i].source);
+ qreal w = fragments[i].scaleX * fragments[i].width;
+ qreal h = fragments[i].scaleY * fragments[i].height;
+ QRectF sourceRect(fragments[i].sourceLeft, fragments[i].sourceTop,
+ fragments[i].width, fragments[i].height);
+ drawPixmap(QRectF(-0.5 * w, -0.5 * h, w, h), pixmap, sourceRect);
}
state()->opacity = oldOpacity;
83bda5ad'>Fix copyright year.Jason McDonald2010-02-1610-10/+10 * | Make compile on Symbian (call Q_DECLARE_METATYPE earlier)Bea Lam2010-02-172-1/+5 * | MOBILITY-404 QS Windows.Wolfgang Beck2010-02-161-2/+6 * | For qmldebug* tests, make sure engine is running before the test threadBea Lam2010-02-152-1/+36 |/ * Fix warningsAaron Kennedy2010-02-121-1/+1 * fix includesOswald Buddenhagen2009-12-035-15/+25 * clean up project filesOswald Buddenhagen2009-12-031-10/+14 * Undo most of 913dd563064e8047fe738fc9c79135adfb928977Warwick Allison2009-12-025-9/+9 * Remove include styles that rely on configure.Warwick Allison2009-12-013-3/+3 * Fix debugger crash on exitBea Lam2009-11-111-4/+5 * Change stateChanged(State) signatures to have (QmlDebugWatch::State)Bea Lam2009-11-111-2/+2 * Change watch state to Dead instead of Active on removal.Bea Lam2009-11-111-5/+4 * Minor improvements, additional pointer checks.Bea Lam2009-11-101-9/+17 * Fix crash bug where socket is 0.Bea Lam2009-11-101-0/+2 * Fix crash when watch is deleted before calling removeWatch().Bea Lam2009-11-082-1/+13 * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Bea Lam2009-11-02