MCL/sf/mw/qt: comparison src/gui/text/qfontengine

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 OUTLINETEXTMETRIC *otm = getOutlineTextMetric(hdc);
 designToDevice = QFixed((int)otm->otmEMSquare)/int(otm->otmTextMetrics.tmHeight);
 unitsPerEm = otm->otmEMSquare;
 x_height = (int)otm->otmsXHeight;
 loadKerningPairs(designToDevice);
-_faceId.filename = (char *)otm + (int)otm->otmpFullName;
+_faceId.filename = QString::fromWCharArray((wchar_t *)((char *)otm + (int)otm->otmpFullName)).toLatin1();
 lineWidth = otm->otmsUnderscoreSize;
 fsType = otm->otmfsType;
 free(otm);
 } else {
 unitsPerEm = tm.tmHeight;
 w += glyphs.effectiveAdvance(i);
 return glyph_metrics_t(0, -tm.tmAscent, w, tm.tmHeight, w, 0);
 }
+#ifndef Q_WS_WINCE
+bool QFontEngineWin::getOutlineMetrics(glyph_t glyph, const QTransform &t, glyph_metrics_t *metrics) const
+{
+Q_ASSERT(metrics != 0);
+HDC hdc = shared_dc();
+GLYPHMETRICS gm;
+DWORD res = 0;
+MAT2 mat;
+mat.eM11.value = mat.eM22.value = 1;
+mat.eM11.fract = mat.eM22.fract = 0;
+mat.eM21.value = mat.eM12.value = 0;
+mat.eM21.fract = mat.eM12.fract = 0;
+if (t.type() > QTransform::TxTranslate) {
+// We need to set the transform using the HDC's world
+// matrix rather than using the MAT2 above, because the
+// results provided when transforming via MAT2 does not
+// match the glyphs that are drawn using a WorldTransform
+XFORM xform;
+xform.eM11 = t.m11();
+xform.eM12 = t.m12();
+xform.eM21 = t.m21();
+xform.eM22 = t.m22();
+xform.eDx = 0;
+xform.eDy = 0;
+SetGraphicsMode(hdc, GM_ADVANCED);
+SetWorldTransform(hdc, &xform);
+}
+uint format = GGO_METRICS;
+if (ttf)
+format |= GGO_GLYPH_INDEX;
+res = GetGlyphOutline(hdc, glyph, format, &gm, 0, 0, &mat);
+if (t.type() > QTransform::TxTranslate) {
+XFORM xform;
+xform.eM11 = xform.eM22 = 1;
+xform.eM12 = xform.eM21 = xform.eDx = xform.eDy = 0;
+SetWorldTransform(hdc, &xform);
+SetGraphicsMode(hdc, GM_COMPATIBLE);
+}
+if (res != GDI_ERROR) {
+*metrics = glyph_metrics_t(gm.gmptGlyphOrigin.x, -gm.gmptGlyphOrigin.y,
+(int)gm.gmBlackBoxX, (int)gm.gmBlackBoxY, gm.gmCellIncX, gm.gmCellIncY);
+return true;
+} else {
+return false;
+}
+}
+#endif
 glyph_metrics_t QFontEngineWin::boundingBox(glyph_t glyph, const QTransform &t)
 {
 #ifndef Q_WS_WINCE
-GLYPHMETRICS gm;
 HDC hdc = shared_dc();
 SelectObject(hdc, hfont);
-if (!ttf) {
+glyph_metrics_t glyphMetrics;
+bool success = getOutlineMetrics(glyph, t, &glyphMetrics);
+if (!ttf && !success) {
+// Bitmap fonts
 wchar_t ch = glyph;
 ABCFLOAT abc;
 GetCharABCWidthsFloat(hdc, ch, ch, &abc);
 int width = qRound(abc.abcfB);
-return glyph_metrics_t(0, -tm.tmAscent, width, tm.tmHeight, width, 0).transformed(t);
+return glyph_metrics_t(QFixed::fromReal(abc.abcfA), -tm.tmAscent, width, tm.tmHeight, width, 0).transformed(t);
-} else {
+}
-DWORD res = 0;
-MAT2 mat;
+return glyphMetrics;
-mat.eM11.value = mat.eM22.value = 1;
-mat.eM11.fract = mat.eM22.fract = 0;
-mat.eM21.value = mat.eM12.value = 0;
-mat.eM21.fract = mat.eM12.fract = 0;
-if (t.type() > QTransform::TxTranslate) {
-// We need to set the transform using the HDC's world
-// matrix rather than using the MAT2 above, because the
-// results provided when transforming via MAT2 does not
-// match the glyphs that are drawn using a WorldTransform
-XFORM xform;
-xform.eM11 = t.m11();
-xform.eM12 = t.m12();
-xform.eM21 = t.m21();
-xform.eM22 = t.m22();
-xform.eDx = 0;
-xform.eDy = 0;
-SetGraphicsMode(hdc, GM_ADVANCED);
-SetWorldTransform(hdc, &xform);
-}
-res = GetGlyphOutline(hdc, glyph, GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, 0, &mat);
-if (t.type() > QTransform::TxTranslate) {
-XFORM xform;
-xform.eM11 = xform.eM22 = 1;
-xform.eM12 = xform.eM21 = xform.eDx = xform.eDy = 0;
-SetWorldTransform(hdc, &xform);
-SetGraphicsMode(hdc, GM_COMPATIBLE);
-}
-if (res != GDI_ERROR) {
-return glyph_metrics_t(gm.gmptGlyphOrigin.x, -gm.gmptGlyphOrigin.y,
-(int)gm.gmBlackBoxX, (int)gm.gmBlackBoxY, gm.gmCellIncX, gm.gmCellIncY);
-}
-}
-return glyph_metrics_t();
 #else
 HDC hdc = shared_dc();
 HGDIOBJ oldFont = SelectObject(hdc, hfont);
 ABC abc;
 return tm.tmAscent;
 }
 QFixed QFontEngineWin::descent() const
 {
-return tm.tmDescent;
+// ### we substract 1 to even out the historical +1 in QFontMetrics's
+// ### height=asc+desc+1 equation. Fix in Qt5.
+return tm.tmDescent - 1;
 }
 QFixed QFontEngineWin::leading() const
 {
 return tm.tmExternalLeading;
 HGDIOBJ oldfont = SelectObject(hdc, hf);
 OUTLINETEXTMETRIC *otm = getOutlineTextMetric(hdc);
 Properties p;
 p.emSquare = unitsPerEm;
 p.italicAngle = otm->otmItalicAngle;
-p.postscriptName = (char *)otm + (int)otm->otmpFamilyName;
+p.postscriptName = QString::fromWCharArray((wchar_t *)((char *)otm + (int)otm->otmpFamilyName)).toLatin1();
-p.postscriptName += (char *)otm + (int)otm->otmpStyleName;
+p.postscriptName += QString::fromWCharArray((wchar_t *)((char *)otm + (int)otm->otmpStyleName)).toLatin1();
 #ifndef QT_NO_PRINTER
 p.postscriptName = QPdf::stripSpecialCharacters(p.postscriptName);
 #endif
 p.boundingBox = QRectF(otm->otmrcFontBox.left, -otm->otmrcFontBox.top,
 otm->otmrcFontBox.right - otm->otmrcFontBox.left,
 QNativeImage *ni = new QNativeImage(iw + 2 * margin + 4,
 ih + 2 * margin + 4,
 QNativeImage::systemFormat(), !qt_cleartype_enabled);
 /*If cleartype is enabled we use the standard system format even on Windows CE
 and not the special textbuffer format we have to use if cleartype is disabled*/
 ni->image.fill(0xffffffff);
 HDC hdc = ni->hdc;
 } else
 #endif
 {
 ExtTextOut(hdc, -gx + margin, -gy + margin, options, 0, (LPCWSTR) &glyph, 1, 0);
 }
 SelectObject(hdc, old_font);
 return ni;
 }

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7