summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Kjernåsen <trond@trolltech.com>2009-04-28 08:55:31 (GMT)
committerTrond Kjernåsen <trond@trolltech.com>2009-04-28 09:02:52 (GMT)
commit20217d3521a9e59a0730a0eb63d09ffb1c236bdc (patch)
tree7af18b993d2b787492c6770fc4b705ea3a07eea9
parent0901f3f8055240d97def42d59e6a76e0b299e985 (diff)
downloadQt-20217d3521a9e59a0730a0eb63d09ffb1c236bdc.zip
Qt-20217d3521a9e59a0730a0eb63d09ffb1c236bdc.tar.gz
Qt-20217d3521a9e59a0730a0eb63d09ffb1c236bdc.tar.bz2
Fixed rendering of bitmap fonts on X11 with Xrender and fontconfig.
It seems the Xrender PictStandardA1 mask format doesn't work with XLFD bitmap fonts wrapped in a fontconfig structure. Task-number: 252328 Reviewed-by: Samuel
-rw-r--r--src/gui/painting/qpaintengine_x11.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/painting/qpaintengine_x11.cpp b/src/gui/painting/qpaintengine_x11.cpp
index 39ce59f..4b2fbca 100644
--- a/src/gui/painting/qpaintengine_x11.cpp
+++ b/src/gui/painting/qpaintengine_x11.cpp
@@ -2352,7 +2352,9 @@ void QX11PaintEngine::drawFreetype(const QPointF &p, const QTextItemInt &ti)
GlyphSet glyphSet = set->id;
const QColor &pen = d->cpen.color();
::Picture src = X11->getSolidFill(d->scrn, pen);
- XRenderPictFormat *maskFormat = XRenderFindStandardFormat(X11->display, ft->xglyph_format);
+ XRenderPictFormat *maskFormat = 0;
+ if (ft->xglyph_format != PictStandardA1)
+ maskFormat = XRenderFindStandardFormat(X11->display, ft->xglyph_format);
enum { t_min = SHRT_MIN, t_max = SHRT_MAX };