From 95d2939a73d41e267b6419e928322842e4666807 Mon Sep 17 00:00:00 2001 From: "Oleg.Korshul" Date: Tue, 25 Jun 2024 17:39:06 +0300 Subject: [PATCH] Fix bug 61747 --- DesktopEditor/fontengine/ApplicationFontsWorker.cpp | 6 ++++++ DesktopEditor/fontengine/ApplicationFontsWorker.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/DesktopEditor/fontengine/ApplicationFontsWorker.cpp b/DesktopEditor/fontengine/ApplicationFontsWorker.cpp index 9f508ca721..3a24fc4a71 100644 --- a/DesktopEditor/fontengine/ApplicationFontsWorker.cpp +++ b/DesktopEditor/fontengine/ApplicationFontsWorker.cpp @@ -869,6 +869,12 @@ public: mapFontsPriorityStandard.insert(std::pair(L"SimHei", 34)); mapFontsPriorityStandard.insert(std::pair(L"Meiryo", 35)); +#ifdef _MAC + mapFontsPriorityStandard.insert(std::pair(L"PingFang SC", 36)); + mapFontsPriorityStandard.insert(std::pair(L"PingFang TC", 37)); + mapFontsPriorityStandard.insert(std::pair(L"PingFang HK", 38)); +#endif + NSFonts::CApplicationFontsSymbols oApplicationChecker; // приоритеты шрифтов. по имени (все стили) diff --git a/DesktopEditor/fontengine/ApplicationFontsWorker.h b/DesktopEditor/fontengine/ApplicationFontsWorker.h index b459889932..ee12e5a4e2 100644 --- a/DesktopEditor/fontengine/ApplicationFontsWorker.h +++ b/DesktopEditor/fontengine/ApplicationFontsWorker.h @@ -36,7 +36,7 @@ #include #include "../graphics/pro/Fonts.h" -#define ONLYOFFICE_FONTS_VERSION 11 +#define ONLYOFFICE_FONTS_VERSION 12 #define ONLYOFFICE_ALL_FONTS_VERSION 2 class CApplicationFontsWorkerBreaker