diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-05-06 09:58:56 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-05-06 13:04:43 (GMT) |
| commit | 2043637a4e17252062fcb483e2e63ce0cb0920dd (patch) | |
| tree | 6b6d8c90298f10bbfbf20dda6f81a1aba9819e9c /src/opengl | |
| parent | 3cec5ff3f0aa8d3eca0dfb325e83a8a3a18cb305 (diff) | |
| download | Qt-2043637a4e17252062fcb483e2e63ce0cb0920dd.zip Qt-2043637a4e17252062fcb483e2e63ce0cb0920dd.tar.gz Qt-2043637a4e17252062fcb483e2e63ce0cb0920dd.tar.bz2 | |
Re-enabled antialiasing for large font sizes in OpenGL paint engine.
In 4.4 alphaMapForGlyph() would return valid images for any font size,
but this was changed in 4.5, forcing us to use the path fallback
instead. This lead to non-antialiased fonts when not using a
multisample-enabled GL format. This patch re-introduces the
alphaMapForGlyph() fallback in QFontEngine from 4.4 which uses the
raster paint engine to draw the glyph.
Task-number: 247083
Reviewed-by: Trond
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qpaintengine_opengl.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp index ec6e33b..5a212f5 100644 --- a/src/opengl/qpaintengine_opengl.cpp +++ b/src/opengl/qpaintengine_opengl.cpp @@ -5068,9 +5068,8 @@ void QOpenGLPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textIte // fall back to drawing a polygon if the scale factor is large, or // we use a gradient pen - if (ti.fontEngine->fontDef.pixelSize >= 64 - || (d->matrix.det() > 1) || (d->pen_brush_style >= Qt::LinearGradientPattern - && d->pen_brush_style <= Qt::ConicalGradientPattern)) { + if ((d->matrix.det() > 1) || (d->pen_brush_style >= Qt::LinearGradientPattern + && d->pen_brush_style <= Qt::ConicalGradientPattern)) { QPaintEngine::drawTextItem(p, textItem); return; } |