From c748883bd3347885494c62f63bb8e629fb00403f Mon Sep 17 00:00:00 2001 From: RadRussianRus Date: Tue, 1 Oct 2019 20:51:11 +0300 Subject: [PATCH] Apply custom fonts after app restart --- .../SourceFiles/platform/linux/launcher_linux.cpp | 15 +++++++++++++++ Telegram/SourceFiles/platform/mac/launcher_mac.mm | 15 +++++++++++++++ .../SourceFiles/platform/win/launcher_win.cpp | 15 +++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp index 2722ffbff..02b5488e6 100644 --- a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp @@ -75,6 +75,21 @@ bool Launcher::launchUpdater(UpdaterLaunch action) { argumentsList.push("-externalupdater"); } #endif // !TDESKTOP_DISABLE_AUTOUPDATE + if (cMainFont()) { + argumentsList.push(qsl("-mainfont")); + pushArgument(QFile::encodeName(cMainFont())); + } + if (cSemiboldFont()) { + argumentsList.push(qsl("-semiboldfont")); + pushArgument(QFile::encodeName(cSemiboldFont())); + } + if (cSemiboldFontIsBold()) { + argumentsList.push(qsl("-semiboldisbold")); + } + if (cMonospaceFont()) { + argumentsList.push(qsl("-monospacefont")); + pushArgument(QFile::encodeName(cMonospaceFont())); + } if (cDataFile() != qsl("data")) { argumentsList.push("-key"); argumentsList.push(QFile::encodeName(cDataFile())); diff --git a/Telegram/SourceFiles/platform/mac/launcher_mac.mm b/Telegram/SourceFiles/platform/mac/launcher_mac.mm index 23d4dadca..fbc225eea 100644 --- a/Telegram/SourceFiles/platform/mac/launcher_mac.mm +++ b/Telegram/SourceFiles/platform/mac/launcher_mac.mm @@ -67,6 +67,21 @@ bool Launcher::launchUpdater(UpdaterLaunch action) { #ifndef TDESKTOP_DISABLE_AUTOUPDATE if (Core::UpdaterDisabled()) [args addObject:@"-externalupdater"]; #endif // !TDESKTOP_DISABLE_AUTOUPDATE + if (cMainFont()) { + [args addObject:@"-mainfont"]; + [args addObject:Q2NSString(cMainFont())]; + } + if (cSemiboldFont()) { + [args addObject:@"-semiboldfont"]; + [args addObject:Q2NSString(cSemiboldFont())]; + } + if (cSemiboldFontIsBold()) { + argumentsList.push(qsl("-semiboldisbold")); + } + if (cMonospaceFont()) { + [args addObject:@"-monospacefont"]; + [args addObject:Q2NSString(cMonospaceFont())]; + } if (cDataFile() != qsl("data")) { [args addObject:@"-key"]; [args addObject:Q2NSString(cDataFile())]; diff --git a/Telegram/SourceFiles/platform/win/launcher_win.cpp b/Telegram/SourceFiles/platform/win/launcher_win.cpp index 5eda272fb..e1c953d83 100644 --- a/Telegram/SourceFiles/platform/win/launcher_win.cpp +++ b/Telegram/SourceFiles/platform/win/launcher_win.cpp @@ -80,6 +80,21 @@ bool Launcher::launchUpdater(UpdaterLaunch action) { pushArgument(qsl("-workdir")); pushArgument('"' + cWorkingDir() + '"'); } + if (cMainFont()) { + pushArgument(qsl("-mainfont")); + pushArgument('"' + cMainFont() + '"'); + } + if (cSemiboldFont()) { + pushArgument(qsl("-semiboldfont")); + pushArgument('"' + cSemiboldFont() + '"'); + } + if (cSemiboldFontIsBold()) { + pushArgument(qsl("-semiboldisbold")); + } + if (cMonospaceFont()) { + pushArgument(qsl("-monospacefont")); + pushArgument('"' + cMonospaceFont() + '"'); + } if (cDataFile() != qsl("data")) { pushArgument(qsl("-key")); pushArgument('"' + cDataFile() + '"');