Use extern with custom font variables (#7)

This commit is contained in:
ilya-fedin 2020-03-06 23:14:08 +00:00 committed by GitHub
parent 6b02149040
commit b78840238d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions

View file

@ -164,22 +164,22 @@ Application::~Application() {
void Application::run() {
KotatoSettings::Start();
if (!cMainFont().isEmpty()) {
style::internal::SetMainFont(cMainFont());
style::internal::CustomMainFont = cMainFont();
}
if (!cSemiboldFont().isEmpty()) {
style::internal::SetSemiboldFont(cSemiboldFont());
style::internal::CustomSemiboldFont = cSemiboldFont();
}
if (cSemiboldFontIsBold()) {
style::internal::SetSemiboldIsBold(cSemiboldFontIsBold());
style::internal::CustomSemiboldIsBold = cSemiboldFontIsBold();
}
if (!cMonospaceFont().isEmpty()) {
style::internal::SetMonospaceFont(cMonospaceFont());
style::internal::CustomMonospaceFont = cMonospaceFont();
}
if (cUseSystemFont()) {
style::internal::SetUseSystemFont(cUseSystemFont());
style::internal::UseSystemFont = cUseSystemFont();
}
if (cUseOriginalMetrics()) {
style::internal::SetUseOriginalMetrics(cUseOriginalMetrics());
style::internal::UseOriginalMetrics = cUseOriginalMetrics();
}
style::internal::StartFonts();

@ -1 +1 @@
Subproject commit 8ce091c15946b34e7370196224ccbcd5d3d4ba61
Subproject commit e6fdff459713ae6b8faafcde2f5c5255343652d4