mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-03 08:05:12 +00:00
Code Issues Releases Wiki Activity

Move setting fonts to UiIntegration::startFontsBegin

Browse Source
This commit is contained in:
RadRussianRus
2020-04-25 02:14:07 +03:00
parent 32e57987a3
commit 0dfaa50d40
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Telegram/SourceFiles/core/application.cpp
View File

@@ -183,24 +183,6 @@ Application::~Application() {
void Application::run() { void Application::run() {
Kotato::JsonSettings::Start(); Kotato::JsonSettings::Start();
if (!cMainFont().isEmpty()) {
style::internal::CustomMainFont = cMainFont();
}
if (!cSemiboldFont().isEmpty()) {
style::internal::CustomSemiboldFont = cSemiboldFont();
}
if (cSemiboldFontIsBold()) {
style::internal::CustomSemiboldIsBold = cSemiboldFontIsBold();
}
if (!cMonospaceFont().isEmpty()) {
style::internal::CustomMonospaceFont = cMonospaceFont();
}
if (cUseSystemFont()) {
style::internal::UseSystemFont = cUseSystemFont();
}
if (cUseOriginalMetrics()) {
style::internal::UseOriginalMetrics = cUseOriginalMetrics();
}
style::internal::StartFonts(); style::internal::StartFonts();
ThirdParty::start(); ThirdParty::start();

18
Telegram/SourceFiles/core/ui_integration.cpp
View File

@@ -54,6 +54,24 @@ void UiIntegration::activationFromTopPanel() {
void UiIntegration::startFontsBegin() { void UiIntegration::startFontsBegin() {
Platform::FallbackFontConfigCheckBegin(); Platform::FallbackFontConfigCheckBegin();
if (!cMainFont().isEmpty()) {
style::internal::CustomMainFont = cMainFont();
}
if (!cSemiboldFont().isEmpty()) {
style::internal::CustomSemiboldFont = cSemiboldFont();
}
if (cSemiboldFontIsBold()) {
style::internal::CustomSemiboldIsBold = cSemiboldFontIsBold();
}
if (!cMonospaceFont().isEmpty()) {
style::internal::CustomMonospaceFont = cMonospaceFont();
}
if (cUseSystemFont()) {
style::internal::UseSystemFont = cUseSystemFont();
}
if (cUseOriginalMetrics()) {
style::internal::UseOriginalMetrics = cUseOriginalMetrics();
}
} }
void UiIntegration::startFontsEnd() { void UiIntegration::startFontsEnd() {