diff options
| author | Dmitry Porunov | 2019-11-11 04:39:37 +0400 |
|---|---|---|
| committer | Dmitry Porunov | 2019-11-11 04:39:37 +0400 |
| commit | a93d8b49fc77c1086164cd349fede66e08003f9d (patch) | |
| tree | 9fb49f97fdf1fc2a2b7222fd42e1ab1fe4577454 /Use-system-wide-font.patch | |
| parent | 9abda47ab98590c8e869e52abb24d19ab1d1df36 (diff) | |
| download | aur-a93d8b49fc77c1086164cd349fede66e08003f9d.tar.gz | |
Release k1.1
Diffstat (limited to 'Use-system-wide-font.patch')
| -rw-r--r-- | Use-system-wide-font.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/Use-system-wide-font.patch b/Use-system-wide-font.patch new file mode 100644 index 000000000000..e08edb5a0569 --- /dev/null +++ b/Use-system-wide-font.patch @@ -0,0 +1,32 @@ +diff --git a/Telegram/Resources/qrc/fonts.qrc b/Telegram/Resources/qrc/fonts.qrc +index 233b8d572..122d89140 100644 +--- a/Telegram/Resources/qrc/fonts.qrc ++++ b/Telegram/Resources/qrc/fonts.qrc +@@ -1,7 +1,4 @@ + <RCC> + <qresource prefix="/gui"> +- <file alias="fonts/OpenSans-Regular.ttf">../fonts/OpenSans-Regular.ttf</file> +- <file alias="fonts/OpenSans-Bold.ttf">../fonts/OpenSans-Bold.ttf</file> +- <file alias="fonts/OpenSans-Semibold.ttf">../fonts/OpenSans-Semibold.ttf</file> + </qresource> + </RCC> +diff --git a/Telegram/SourceFiles/ui/style/style_core_font.cpp b/Telegram/SourceFiles/ui/style/style_core_font.cpp +index 22ccfea7e..36f271f93 100644 +--- a/Telegram/SourceFiles/ui/style/style_core_font.cpp ++++ b/Telegram/SourceFiles/ui/style/style_core_font.cpp +@@ -84,9 +84,9 @@ void StartFonts() { + } + Started = true; + +- auto regular = LoadCustomFont(":/gui/fonts/OpenSans-Regular.ttf", "Open Sans"); +- auto bold = LoadCustomFont(":/gui/fonts/OpenSans-Bold.ttf", "Open Sans", style::internal::FontBold); +- auto semibold = LoadCustomFont(":/gui/fonts/OpenSans-Semibold.ttf", "Open Sans Semibold"); ++ auto regular = ValidateFont("Open Sans"); ++ auto bold = ValidateFont("Open Sans", style::internal::FontBold); ++ auto semibold = ValidateFont("Open Sans Semibold"); + + #ifdef Q_OS_WIN + // Attempt to workaround a strange font bug with Open Sans Semibold not loading. +-- +2.23.0 + |