From b78840238d9e735ef7878d8412f00d4f389dfe6a Mon Sep 17 00:00:00 2001 From: ilya-fedin Date: Fri, 6 Mar 2020 23:14:08 +0000 Subject: [PATCH] Use extern with custom font variables (#7) --- Telegram/SourceFiles/core/application.cpp | 12 ++++++------ Telegram/lib_ui | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp index cb3c40911..0898544a3 100644 --- a/Telegram/SourceFiles/core/application.cpp +++ b/Telegram/SourceFiles/core/application.cpp @@ -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(); diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 8ce091c15..e6fdff459 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 8ce091c15946b34e7370196224ccbcd5d3d4ba61 +Subproject commit e6fdff459713ae6b8faafcde2f5c5255343652d4