summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-05-18 01:57:29 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-05-18 01:57:29 (GMT)
commit1ba3a79e05e96e7a7d38f25cf05d691c4f590559 (patch)
treed0aa0762d7090dd01d5ad7af1a87bc105245a7c9
parent1db36a5a37dcca0e24ada3c852f2647ab2330eee (diff)
downloadQt-1ba3a79e05e96e7a7d38f25cf05d691c4f590559.zip
Qt-1ba3a79e05e96e7a7d38f25cf05d691c4f590559.tar.gz
Qt-1ba3a79e05e96e7a7d38f25cf05d691c4f590559.tar.bz2
Don't disable SmoothPixmapTransform in qDrawBorderPixmap()
Reverts part of ba8ff70b5ac7b68be57a4b63e439fd5a37c4aafa Drawing is far too ugly without SmoothPixmapTransform. Some glitches remain after this change, but they are due to a bug: QTBUG-10524 Task-number: QTBUG-5687 Reviewed-by: Aaron Kennedy
-rw-r--r--src/gui/painting/qdrawutil.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gui/painting/qdrawutil.cpp b/src/gui/painting/qdrawutil.cpp
index ef9b18c..3ce95ef 100644
--- a/src/gui/painting/qdrawutil.cpp
+++ b/src/gui/painting/qdrawutil.cpp
@@ -1138,12 +1138,10 @@ void qDrawBorderPixmap(QPainter *painter, const QRect &targetRect, const QMargin
yTarget.resize(rows + 1);
bool oldAA = painter->testRenderHint(QPainter::Antialiasing);
- bool oldSmooth = painter->testRenderHint(QPainter::SmoothPixmapTransform);
if (painter->paintEngine()->type() != QPaintEngine::OpenGL
&& painter->paintEngine()->type() != QPaintEngine::OpenGL2
- && (oldSmooth || oldAA) && painter->combinedTransform().type() != QTransform::TxNone) {
+ && oldAA && painter->combinedTransform().type() != QTransform::TxNone) {
painter->setRenderHint(QPainter::Antialiasing, false);
- painter->setRenderHint(QPainter::SmoothPixmapTransform, false);
}
xTarget[0] = targetRect.left();
@@ -1354,8 +1352,6 @@ void qDrawBorderPixmap(QPainter *painter, const QRect &targetRect, const QMargin
if (oldAA)
painter->setRenderHint(QPainter::Antialiasing, true);
- if (oldSmooth)
- painter->setRenderHint(QPainter::SmoothPixmapTransform, true);
}
QT_END_NAMESPACE