macOS: Fix synthesized bold
When a user requested bold and there was no available font for this (which is quite common with CJK fonts and in fact is the case for the official Japanese font on the system), we should synthesize the boldness. This was done by checking if the requested font weight boldness matched the one in the font's traits, and if not, we flag the font boldness to be synthesized. But when initializing the font, we would first override the requested weight with the selected font's weight, *before* performing the check above. So even if there was a mismatch, we would not catch this and as a result, e.g. the system Japanese font would never be bold. [ChangeLog][macOS] Fixed an issue where boldness would not be correctly synthesized for families with no bold variant. Fixes: QTBUG-85634 Change-Id: I36da59d7689455e29cca283cb0724a0841095918 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 76d3cda88469137050f6aab4bbb8578061fe25f2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
2334a452b9
commit
2a2680ea22
@ -253,13 +253,15 @@ void QCoreTextFontEngine::init()
|
||||
};
|
||||
|
||||
QCFType<CFDictionaryRef> allTraits = CTFontCopyTraits(ctfont);
|
||||
fontDef.weight = QCoreTextFontEngine::qtWeightFromCFWeight(getTraitValue(allTraits, kCTFontWeightTrait));
|
||||
int slant = static_cast<int>(getTraitValue(allTraits, kCTFontSlantTrait) * 500 + 500);
|
||||
if (slant > 500 && !(traits & kCTFontItalicTrait))
|
||||
fontDef.style = QFont::StyleOblique;
|
||||
|
||||
if (fontDef.weight >= QFont::Bold && !(traits & kCTFontBoldTrait) && !qEnvironmentVariableIsSet("QT_NO_SYNTHESIZED_BOLD"))
|
||||
synthesisFlags |= SynthesizedBold;
|
||||
else
|
||||
fontDef.weight = QCoreTextFontEngine::qtWeightFromCFWeight(getTraitValue(allTraits, kCTFontWeightTrait));
|
||||
|
||||
if (fontDef.style != QFont::StyleNormal && !(traits & kCTFontItalicTrait) && !qEnvironmentVariableIsSet("QT_NO_SYNTHESIZED_ITALIC"))
|
||||
synthesisFlags |= SynthesizedItalic;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user