Fix setWeight order
This commit is contained in:
parent
725d768f0f
commit
1647b0b76a
1 changed files with 6 additions and 6 deletions
|
|
@ -288,18 +288,18 @@ FontData::FontData(int size, uint32 flags, int family, Font *other)
|
|||
f.setFamily(GetFontOverride(flags));
|
||||
}
|
||||
|
||||
#ifdef DESKTOP_APP_USE_PACKAGED_FONTS
|
||||
if (_flags & FontSemibold) {
|
||||
f.setWeight(QFont::DemiBold);
|
||||
}
|
||||
#endif // DESKTOP_APP_USE_PACKAGED_FONTS
|
||||
|
||||
f.setPixelSize(size);
|
||||
f.setBold(_flags & FontBold);
|
||||
f.setItalic(_flags & FontItalic);
|
||||
f.setUnderline(_flags & FontUnderline);
|
||||
f.setStrikeOut(_flags & FontStrikeOut);
|
||||
|
||||
#ifdef DESKTOP_APP_USE_PACKAGED_FONTS
|
||||
if (_flags & FontSemibold) {
|
||||
f.setWeight(QFont::DemiBold);
|
||||
}
|
||||
#endif // DESKTOP_APP_USE_PACKAGED_FONTS
|
||||
|
||||
m = QFontMetrics(f);
|
||||
height = m.height();
|
||||
ascent = m.ascent();
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue