equal
deleted
inserted
replaced
555 return glyph_metrics_t(); |
555 return glyph_metrics_t(); |
556 |
556 |
557 QFixed w = 0; |
557 QFixed w = 0; |
558 for (int i = 0; i < glyphs.numGlyphs; ++i) |
558 for (int i = 0; i < glyphs.numGlyphs; ++i) |
559 w += glyphs.effectiveAdvance(i); |
559 w += glyphs.effectiveAdvance(i); |
560 return glyph_metrics_t(0, -ascent(), w, ascent()+descent()+1, w, 0); |
560 return glyph_metrics_t(0, -ascent(), w - lastRightBearing(glyphs), ascent()+descent()+1, w, 0); |
561 } |
561 } |
562 |
562 |
563 glyph_metrics_t QFontEngineQPF1::boundingBox(glyph_t glyph) |
563 glyph_metrics_t QFontEngineQPF1::boundingBox(glyph_t glyph) |
564 { |
564 { |
565 const QPFGlyph *g = d->tree->get(glyph); |
565 const QPFGlyph *g = d->tree->get(glyph); |