diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-04 04:02:49 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-04 04:02:49 (GMT) |
| commit | eed800e044551118797c5e54fd4fcae9080fa669 (patch) | |
| tree | 09199623f8bded7205d8db539f4d6150bc6528cd /src/declarative | |
| parent | 68a2c152e6c13d63bc77309bebb5cac260937e68 (diff) | |
| parent | 5974c8a7216459e1ce820c42e448b49cea49a778 (diff) | |
| download | Qt-eed800e044551118797c5e54fd4fcae9080fa669.zip Qt-eed800e044551118797c5e54fd4fcae9080fa669.tar.gz Qt-eed800e044551118797c5e54fd4fcae9080fa669.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/fx/qfxflickable.cpp | 4 | ||||
| -rw-r--r-- | src/declarative/fx/qfxpainteditem.cpp | 14 |
2 files changed, 5 insertions, 13 deletions
diff --git a/src/declarative/fx/qfxflickable.cpp b/src/declarative/fx/qfxflickable.cpp index 0ea50b8..007fa0e 100644 --- a/src/declarative/fx/qfxflickable.cpp +++ b/src/declarative/fx/qfxflickable.cpp @@ -433,8 +433,8 @@ void QFxFlickable::setViewportX(qreal pos) { Q_D(QFxFlickable); pos = qRound(pos); + d->timeline.reset(d->_moveX); if (-pos != d->_moveX.value()) { - d->timeline.reset(d->_moveX); d->_moveX.setValue(-pos); viewportMoved(); } @@ -450,8 +450,8 @@ void QFxFlickable::setViewportY(qreal pos) { Q_D(QFxFlickable); pos = qRound(pos); + d->timeline.reset(d->_moveY); if (-pos != d->_moveY.value()) { - d->timeline.reset(d->_moveY); d->_moveY.setValue(-pos); viewportMoved(); } diff --git a/src/declarative/fx/qfxpainteditem.cpp b/src/declarative/fx/qfxpainteditem.cpp index 695236d..cbd00cf 100644 --- a/src/declarative/fx/qfxpainteditem.cpp +++ b/src/declarative/fx/qfxpainteditem.cpp @@ -208,12 +208,6 @@ void QFxPaintedItem::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidge ++inpaint; - bool oldAntiAliasing = p->testRenderHint(QPainter::Antialiasing); - bool oldSmoothPixmap = p->testRenderHint(QPainter::SmoothPixmapTransform); - if (oldAntiAliasing) - p->setRenderHints(QPainter::Antialiasing, false); // cannot stitch properly otherwise - if (d->smooth) - p->setRenderHints(QPainter::SmoothPixmapTransform, true); QRectF clipf = p->clipRegion().boundingRect(); if (clipf.isEmpty()) clipf = mapToScene(content).boundingRect(); // ### Inefficient: Maps toScene and then fromScene @@ -234,6 +228,7 @@ void QFxPaintedItem::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidge if (!d->cachefrozen) { if (!d->imagecache[i]->dirty.isNull() && topaint.contains(d->imagecache[i]->dirty)) { QPainter qp(&d->imagecache[i]->image); + qp.setRenderHints(QPainter::HighQualityAntialiasing | QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform, d->smooth); qp.translate(-area.x(), -area.y()); if (d->fillColor.isValid()) qp.fillRect(d->imagecache[i]->dirty,d->fillColor); @@ -280,6 +275,8 @@ void QFxPaintedItem::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidge img.fill(d->fillColor); { QPainter qp(&img); + qp.setRenderHints(QPainter::HighQualityAntialiasing | QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform, d->smooth); + qp.translate(-r.x(),-r.y()); drawContents(&qp, r); } @@ -296,11 +293,6 @@ void QFxPaintedItem::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidge } } - if (oldAntiAliasing) - p->setRenderHints(QPainter::Antialiasing, oldAntiAliasing); - if (d->smooth) - p->setRenderHints(QPainter::SmoothPixmapTransform, oldSmoothPixmap); - if (inpaint_clearcache) { clearCache(); inpaint_clearcache = 0; |