kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

fix ifdef position and missed condition for demibold (#4)

Browse source
This commit is contained in:
ilya-fedin 2020-05-04 20:41:48 +04:00 • committed by GitHub
parent 0ca2b761c6
commit d607531541
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ui/style/style_core_font.cpp
View file

@ -233,8 +233,8 @@ void StartFonts() {
Ui::Integration::Instance().startFontsBegin(); Ui::Integration::Instance().startFontsBegin();
} }
if (!UseSystemFont) {
#ifndef DESKTOP_APP_USE_PACKAGED_FONTS #ifndef DESKTOP_APP_USE_PACKAGED_FONTS
if (!UseSystemFont) {
bool areGood[FontTypesCount] = { false }; bool areGood[FontTypesCount] = { false };
for (auto i = 0; i != FontTypesCount; ++i) { for (auto i = 0; i != FontTypesCount; ++i) {
const auto name = FontTypeNames[i]; const auto name = FontTypeNames[i];
@ -259,7 +259,6 @@ void StartFonts() {
//QFont::insertSubstitution(name, fallback); //QFont::insertSubstitution(name, fallback);
#endif // Q_OS_WIN #endif // Q_OS_WIN
} }
#endif // !DESKTOP_APP_USE_PACKAGED_FONTS
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
auto list = QStringList(); auto list = QStringList();
@ -272,6 +271,7 @@ void StartFonts() {
} }
#endif // Q_OS_MAC #endif // Q_OS_MAC
} }
#endif // !DESKTOP_APP_USE_PACKAGED_FONTS
if (!CustomMainFont.isEmpty() && ValidateFont(CustomMainFont)) { if (!CustomMainFont.isEmpty() && ValidateFont(CustomMainFont)) {
Overrides[FontTypeRegular] = CustomMainFont; Overrides[FontTypeRegular] = CustomMainFont;
@ -372,7 +372,7 @@ FontData::FontData(int size, uint32 flags, int family, Font *other)
#ifdef DESKTOP_APP_USE_PACKAGED_FONTS #ifdef DESKTOP_APP_USE_PACKAGED_FONTS
} else { } else {
#else // DESKTOP_APP_USE_PACKAGED_FONTS #else // DESKTOP_APP_USE_PACKAGED_FONTS
} else if (UseSystemFont) { } else if (UseSystemFont && overrideIsEmpty) {
#endif // !DESKTOP_APP_USE_PACKAGED_FONTS #endif // !DESKTOP_APP_USE_PACKAGED_FONTS
f.setWeight(QFont::DemiBold); f.setWeight(QFont::DemiBold);
} }