1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

Browse Source 
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Fix QPainter::drawGlyphs() with non-affine transformation
This commit is contained in:
Qt Continuous Integration System 2011-05-06 19:00:01 +10:00
commit f15c1fff3f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/painting/qpainter.cpp
View File

@ -5811,6 +5811,13 @@ void QPainter::drawGlyphs(const QPointF &position, const QGlyphs &glyphs)
d->extended != 0 d->extended != 0
? qt_paintengine_supports_transformations(d->extended->type()) ? qt_paintengine_supports_transformations(d->extended->type())
: qt_paintengine_supports_transformations(d->engine->type()); : qt_paintengine_supports_transformations(d->engine->type());
// If the matrix is not affine, the paint engine will fall back to
// drawing the glyphs as paths, which in turn means we should not
// preprocess the glyph positions
if (!d->state->matrix.isAffine())
paintEngineSupportsTransformations = true;
for (int i=0; i<count; ++i) { for (int i=0; i<count; ++i) {
QPointF processedPosition = position + glyphPositions.at(i); QPointF processedPosition = position + glyphPositions.at(i);
if (!paintEngineSupportsTransformations) if (!paintEngineSupportsTransformations)
@ -5854,7 +5861,7 @@ void QPainterPrivate::drawGlyphs(quint32 *glyphArray, QFixedPoint *positions, in
QFixed width = rightMost - leftMost; QFixed width = rightMost - leftMost;
if (extended != 0) { if (extended != 0 && state->matrix.isAffine()) {
QStaticTextItem staticTextItem; QStaticTextItem staticTextItem;
staticTextItem.color = state->pen.color(); staticTextItem.color = state->pen.color();
staticTextItem.font = state->font; staticTextItem.font = state->font;