kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Choose actual semibold style for system fonts

Browse source
This commit is contained in:
Ilya Fedin 2020-05-08 12:20:34 +04:00 • committed by John Preston
parent f987f596f1
commit 88845bfec9
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ui/style/style_core_font.cpp
View file

@ -168,8 +168,8 @@ QString FontTypeWindowsFallback[FontTypesCount] = {
"Segoe UI", "Segoe UI",
"Segoe UI", "Segoe UI",
"Segoe UI", "Segoe UI",
"Segoe UI Semibold", "Segoe UI",
"Segoe UI Semibold", "Segoe UI",
}; };
#endif // Q_OS_WIN #endif // Q_OS_WIN
@ -269,12 +269,8 @@ QString GetPossibleEmptyOverride(int32 flags) {
} }
QString GetFontOverride(int32 flags) { QString GetFontOverride(int32 flags) {
const auto familyName = (flags & FontSemibold)
? "Open Sans Semibold"
: "Open Sans";
const auto result = GetPossibleEmptyOverride(flags); const auto result = GetPossibleEmptyOverride(flags);
return result.isEmpty() ? familyName : result; return result.isEmpty() ? "Open Sans" : result;
} }
void destroyFonts() { void destroyFonts() {
@ -318,11 +314,9 @@ FontData::FontData(int size, uint32 flags, int family, Font *other)
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) { if (_flags & FontSemibold) {
f.setWeight(QFont::DemiBold); f.setStyleName("Semibold");
} }
#endif // DESKTOP_APP_USE_PACKAGED_FONTS
m = QFontMetrics(f); m = QFontMetrics(f);
height = m.height(); height = m.height();