Moving *_USE_PACKAGED_FONTS and use QFont::DemiBold for system font option
This commit is contained in:
parent
6a0c87e064
commit
a71cde7dd4
1 changed files with 5 additions and 5 deletions
|
|
@ -399,18 +399,18 @@ FontData::FontData(int size, uint32 flags, int family, Font *other)
|
||||||
f.setStrikeOut(_flags & FontStrikeOut);
|
f.setStrikeOut(_flags & FontStrikeOut);
|
||||||
|
|
||||||
if ((_flags & FontBold) || (_flags & FontSemibold)) {
|
if ((_flags & FontBold) || (_flags & FontSemibold)) {
|
||||||
#ifdef DESKTOP_APP_USE_PACKAGED_FONTS
|
|
||||||
if (CustomSemiboldIsBold) {
|
if (CustomSemiboldIsBold) {
|
||||||
f.setBold(true);
|
f.setBold(true);
|
||||||
|
#ifdef DESKTOP_APP_USE_PACKAGED_FONTS
|
||||||
} else {
|
} else {
|
||||||
f.setWeight(QFont::DemiBold);
|
f.setWeight(QFont::DemiBold);
|
||||||
}
|
|
||||||
#else // DESKTOP_APP_USE_PACKAGED_FONTS
|
#else // DESKTOP_APP_USE_PACKAGED_FONTS
|
||||||
f.setBold(true);
|
} else if (UseSystemFont) {
|
||||||
if (!CustomSemiboldIsBold) {
|
f.setWeight(QFont::DemiBold);
|
||||||
|
} else {
|
||||||
f.setStyleName("Semibold");
|
f.setStyleName("Semibold");
|
||||||
}
|
|
||||||
#endif // !DESKTOP_APP_USE_PACKAGED_FONTS
|
#endif // !DESKTOP_APP_USE_PACKAGED_FONTS
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IsRealSemibold(fontOverride)) {
|
if (IsRealSemibold(fontOverride)) {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue