1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FontEngine[directwrite]: include leftBearing for boundingBox for glyphs

Browse Source 
It was always 0

Task-number: QTBUG-113679
Change-Id: I090036296ad2df99b986400863b1e57a5d6101fb
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 1fcbe0f6c24eff66add23bcc6212451a87d64c05)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Mårten Nordheim 2023-06-13 13:29:08 +02:00 committed by Qt Cherry-pick Bot
parent 49f488c855
commit e799b3de67
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/text/windows/qwindowsfontenginedirectwrite.cpp
View File

@ -586,7 +586,9 @@ glyph_metrics_t QWindowsFontEngineDirectWrite::boundingBox(const QGlyphLayout &g
for (int i = 0; i < glyphs.numGlyphs; ++i) for (int i = 0; i < glyphs.numGlyphs; ++i)
w += glyphs.effectiveAdvance(i); w += glyphs.effectiveAdvance(i);
return glyph_metrics_t(0, -ascent(), w - lastRightBearing(glyphs), ascent() + descent(), w, 0); const QFixed leftBearing = firstLeftBearing(glyphs);
return glyph_metrics_t(leftBearing, -ascent(), w - leftBearing - lastRightBearing(glyphs),
ascent() + descent(), w, 0);
} }
glyph_metrics_t QWindowsFontEngineDirectWrite::boundingBox(glyph_t g) glyph_metrics_t QWindowsFontEngineDirectWrite::boundingBox(glyph_t g)