From 29052af594d9ee4af74bdccabca1aadd0310c499 Mon Sep 17 00:00:00 2001 From: RadRussianRus Date: Fri, 24 Apr 2020 18:38:34 +0300 Subject: [PATCH] Post-merge fixes --- ui/style/style_core_font.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ui/style/style_core_font.cpp b/ui/style/style_core_font.cpp index e563e74..5b7719c 100644 --- a/ui/style/style_core_font.cpp +++ b/ui/style/style_core_font.cpp @@ -130,7 +130,7 @@ QString MonospaceFont() { const auto tryFont = [&](const QString &attempt) { const auto resolved = QFontInfo(QFont(attempt)).family(); return !resolved.trimmed().compare(attempt, Qt::CaseInsensitive); - } + }; if (tryFont(CustomMonospaceFont)) { return CustomMonospaceFont; @@ -371,6 +371,12 @@ FontData::FontData(int size, uint32 flags, int family, Font *other) 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 (CustomSemiboldIsBold) { 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)) { f.setStyleName("Semibold"); }