kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Post-merge fixes

Browse source
This commit is contained in:
Eric Kotato 2020-04-24 18:38:34 +03:00
parent 85ffed7fcc
commit 29052af594
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ui/style/style_core_font.cpp
View file

@ -130,7 +130,7 @@ QString MonospaceFont() {
const auto tryFont = [&](const QString &attempt) { const auto tryFont = [&](const QString &attempt) {
const auto resolved = QFontInfo(QFont(attempt)).family(); const auto resolved = QFontInfo(QFont(attempt)).family();
return !resolved.trimmed().compare(attempt, Qt::CaseInsensitive); return !resolved.trimmed().compare(attempt, Qt::CaseInsensitive);
} };
if (tryFont(CustomMonospaceFont)) { if (tryFont(CustomMonospaceFont)) {
return CustomMonospaceFont; return CustomMonospaceFont;
@ -371,6 +371,12 @@ FontData::FontData(int size, uint32 flags, int family, Font *other)
f.setFamily(fontOverride); f.setFamily(fontOverride);
} }
f.setPixelSize(size);
f.setBold(_flags & FontBold);
f.setItalic(_flags & FontItalic);
f.setUnderline(_flags & FontUnderline);
f.setStrikeOut(_flags & FontStrikeOut);
if (_flags & FontSemibold) { if (_flags & FontSemibold) {
if (CustomSemiboldIsBold) { if (CustomSemiboldIsBold) {
f.setBold(true); f.setBold(true);
@ -383,12 +389,6 @@ FontData::FontData(int size, uint32 flags, int family, Font *other)
} }
} }
f.setPixelSize(size);
f.setBold(_flags & FontBold);
f.setItalic(_flags & FontItalic);
f.setUnderline(_flags & FontUnderline);
f.setStrikeOut(_flags & FontStrikeOut);
if (IsRealSemibold(fontOverride)) { if (IsRealSemibold(fontOverride)) {
f.setStyleName("Semibold"); f.setStyleName("Semibold");
} }