kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Fix setWeight order

Browse source
This commit is contained in:
Ilya Fedin 2020-04-25 21:03:42 +04:00 • committed by John Preston
parent 725d768f0f
commit 1647b0b76a
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ui/style/style_core_font.cpp
View file

@ -288,18 +288,18 @@ FontData::FontData(int size, uint32 flags, int family, Font *other)
f.setFamily(GetFontOverride(flags)); 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.setPixelSize(size);
f.setBold(_flags & FontBold); f.setBold(_flags & FontBold);
f.setItalic(_flags & FontItalic); f.setItalic(_flags & FontItalic);
f.setUnderline(_flags & FontUnderline); f.setUnderline(_flags & FontUnderline);
f.setStrikeOut(_flags & FontStrikeOut); 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); m = QFontMetrics(f);
height = m.height(); height = m.height();
ascent = m.ascent(); ascent = m.ascent();