diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2012-05-11 15:03:57 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-11 17:39:13 +0200 |
| commit | 01650d0dc7c41de11abeba6349e5ff38ebee430f (patch) | |
| tree | 09e70868b3e19c03e7053a5c1202bb53b0887ff1 /src/gui/painting | |
| parent | 358fd91951f26cbb552daaf9d28c49429302b6ab (diff) | |
Fix font engine dependent text transformation
The font engine used in supportsTransformation() should be the same
as the one used in drawCachedGlyphs. If it's a multi font engine we
should check the primary font engine inside it.
Change-Id: I384aab3c58edfe2e7ae6fe7fe96bef766053d3ef
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index d6becf0562..2a793a131e 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -5709,7 +5709,10 @@ void QPainter::drawStaticText(const QPointF &topLeftPosition, const QStaticText return; } - bool supportsTransformations = d->extended->supportsTransformations(staticText_d->font.d->engineForScript(QUnicodeTables::Common), + QFontEngine *fe = staticText_d->font.d->engineForScript(QUnicodeTables::Common); + if (fe->type() == QFontEngine::Multi) + fe = static_cast<QFontEngineMulti *>(fe)->engine(0); + bool supportsTransformations = d->extended->supportsTransformations(fe, d->state->matrix); if (supportsTransformations && !staticText_d->untransformedCoordinates) { staticText_d->untransformedCoordinates = true; |