equal
deleted
inserted
replaced
485 |
485 |
486 QFixed w = 0; |
486 QFixed w = 0; |
487 for (int i = 0; i < glyphs.numGlyphs; ++i) |
487 for (int i = 0; i < glyphs.numGlyphs; ++i) |
488 w += glyphs.effectiveAdvance(i); |
488 w += glyphs.effectiveAdvance(i); |
489 |
489 |
490 return glyph_metrics_t(0, -tm.tmAscent, w, tm.tmHeight, w, 0); |
490 return glyph_metrics_t(0, -tm.tmAscent, w - lastRightBearing(glyphs), tm.tmHeight, w, 0); |
491 } |
491 } |
492 |
492 |
493 #ifndef Q_WS_WINCE |
493 #ifndef Q_WS_WINCE |
494 bool QFontEngineWin::getOutlineMetrics(glyph_t glyph, const QTransform &t, glyph_metrics_t *metrics) const |
494 bool QFontEngineWin::getOutlineMetrics(glyph_t glyph, const QTransform &t, glyph_metrics_t *metrics) const |
495 { |
495 { |