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

Fix default line thickness for fonts

Browse Source 
When we are unable to get the line thickness from a font, we
fall back to calculating this based on pixel size and weight.
But the font weight scale has changed in Qt 6, causing the
calculated font weight to be 10x as thick as it should.

This happened e.g. for Titillium Web, but only when using 100%
UI scaling, because the GDI engine was unable to get the correct
line thickness from the font, whereas the DirectWrite engine
succeeded.

[ChangeLog][Windows] Fixes an issue where underlines and other
decorations would be too thick for some fonts.

Fixes: QTBUG-94529
Change-Id: Id2c88f0a145776151be0399ee646f28b3bdf9072
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 1971250de5729386d2ac4ebb1b99c4b84d195a6a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2021-08-23 12:22:14 +02:00 committed by Qt Cherry-pick Bot
parent 538c7855e7
commit 52743057d4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/text/qfontengine.cpp
View File

@ -180,7 +180,7 @@ QFontEngine::~QFontEngine()
QFixed QFontEngine::lineThickness() const QFixed QFontEngine::lineThickness() const
{ {
// ad hoc algorithm // ad hoc algorithm
int score = fontDef.weight * fontDef.pixelSize; int score = fontDef.weight * fontDef.pixelSize / 10;
int lw = score / 700; int lw = score / 700;
// looks better with thicker line for small pointsizes // looks better with thicker line for small pointsizes