AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use correct underline thickness on OS X

Browse Source 
While the calculated underline thickness would be approximately
correct for many fonts and sizes, it was sometimes incorrect,
e.g. for 18 pt Helvetica. Found while investigating QTBUG-33708.

Change-Id: Ic1d8f2d809c02235d8f15f0414536e04c2a7b844
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2016-02-24 11:55:50 +01:00
parent ddef89b323
commit 1d5c29da59
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
View File

@ -215,6 +215,8 @@ void QCoreTextFontEngine::init()
} else } else
avgCharWidth = QFontEngine::averageCharWidth(); avgCharWidth = QFontEngine::averageCharWidth();
underlineThickness = QFixed::fromReal(CTFontGetUnderlineThickness(ctfont));
cache_cost = (CTFontGetAscent(ctfont) + CTFontGetDescent(ctfont)) * avgCharWidth.toInt() * 2000; cache_cost = (CTFontGetAscent(ctfont) + CTFontGetDescent(ctfont)) * avgCharWidth.toInt() * 2000;
// HACK hb_coretext requires both CTFont and CGFont but user_data is only void* // HACK hb_coretext requires both CTFont and CGFont but user_data is only void*
@ -757,6 +759,11 @@ bool QCoreTextFontEngine::supportsTransformation(const QTransform &transform) co
return false; return false;
} }
QFixed QCoreTextFontEngine::lineThickness() const
{
return underlineThickness;
}
QFontEngine::Properties QCoreTextFontEngine::properties() const QFontEngine::Properties QCoreTextFontEngine::properties() const
{ {
Properties result; Properties result;

3
src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
View File

@ -92,6 +92,8 @@ public:
int synthesized() const Q_DECL_OVERRIDE { return synthesisFlags; } int synthesized() const Q_DECL_OVERRIDE { return synthesisFlags; }
bool supportsSubPixelPositions() const Q_DECL_OVERRIDE { return true; } bool supportsSubPixelPositions() const Q_DECL_OVERRIDE { return true; }
QFixed lineThickness() const Q_DECL_OVERRIDE;
void draw(CGContextRef ctx, qreal x, qreal y, const QTextItemInt &ti, int paintDeviceHeight); void draw(CGContextRef ctx, qreal x, qreal y, const QTextItemInt &ti, int paintDeviceHeight);
FaceId faceId() const Q_DECL_OVERRIDE; FaceId faceId() const Q_DECL_OVERRIDE;
@ -140,6 +142,7 @@ private:
int synthesisFlags; int synthesisFlags;
CGAffineTransform transform; CGAffineTransform transform;
QFixed avgCharWidth; QFixed avgCharWidth;
QFixed underlineThickness;
QFontEngine::FaceId face_id; QFontEngine::FaceId face_id;
mutable bool kerningPairsLoaded; mutable bool kerningPairsLoaded;
}; };