diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2012-03-28 07:56:55 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-30 07:33:53 (GMT) |
| commit | 20e2fa25bcf2562e9a6223f95538eb73a1091ece (patch) | |
| tree | 530122d43f4a78f5542500e44597613b031ff5a1 | |
| parent | 005a18ad42ae12179c655ddce33ecd372066eebe (diff) | |
| download | Qt-20e2fa25bcf2562e9a6223f95538eb73a1091ece.zip Qt-20e2fa25bcf2562e9a6223f95538eb73a1091ece.tar.gz Qt-20e2fa25bcf2562e9a6223f95538eb73a1091ece.tar.bz2 | |
The scaling should not effect the width of a cosmetic pen
When the scaling effects the pen width so that it is less than 1 pixel
in width then it would use the QCosmeticStroker to draw, however this
should not be the case for cosmetic pens that are not less than 1 pixel
in width as the scaling does not change their width.
Task-number: QTBUG-25006
Change-Id: I142db0f3a7ee02aa87171495d5a7a7011100814e
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
(cherry picked from commit 6eae3cec5a34fbed28e519ffd8a8f3f1cd7b5c5b)
| -rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 356bbc1..76ee0a4 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -787,7 +787,7 @@ void QRasterPaintEngine::updatePen(const QPen &pen) s->flags.fast_pen = pen_style > Qt::NoPen && s->penData.blend && ((pen.isCosmetic() && penWidth <= 1) - || (s->flags.tx_noshear && penWidth * s->txscale <= 1)); + || (!pen.isCosmetic() && s->flags.tx_noshear && penWidth * s->txscale <= 1)); s->flags.non_complex_pen = qpen_capStyle(s->lastPen) <= Qt::SquareCap && s->flags.tx_noshear; |