From d44e89d9a412020f70384b549bba5132e463543d Mon Sep 17 00:00:00 2001 From: FredFucks <435566248@qq.com> Date: Wed, 17 Jul 2019 17:22:38 +0800 Subject: [PATCH] Fix Chinese fonts on Linux with "WenQuanYi Micro Hei" (#9584) --- src/openrct2/interface/FontFamilies.cpp | 2 ++ src/openrct2/interface/Fonts.cpp | 6 ++++++ src/openrct2/interface/Fonts.h | 1 + 3 files changed, 9 insertions(+) diff --git a/src/openrct2/interface/FontFamilies.cpp b/src/openrct2/interface/FontFamilies.cpp index 4c16ee350b..65bdc30efc 100644 --- a/src/openrct2/interface/FontFamilies.cpp +++ b/src/openrct2/interface/FontFamilies.cpp @@ -16,11 +16,13 @@ TTFontFamily const TTFFamilyChineseSimplified = { &TTFFontSimSun, &TTFFontHeiti, + &TTFFontMicroHei, }; TTFontFamily const TTFFamilyChineseTraditional = { &TTFFontMingLiu, &TTFFontLiHeiPro, + &TTFFontMicroHei, }; TTFontFamily const TTFFamilyJapanese = { diff --git a/src/openrct2/interface/Fonts.cpp b/src/openrct2/interface/Fonts.cpp index 08a56d1d20..7d28446a5e 100644 --- a/src/openrct2/interface/Fonts.cpp +++ b/src/openrct2/interface/Fonts.cpp @@ -83,6 +83,12 @@ TTFFontSetDescriptor TTFFontArialUnicode = { { { "arialuni.ttf", "Arial Unicode MS", 10, 0, -1, 12, HINTING_THRESHOLD_LOW, nullptr }, { "arialuni.ttf", "Arial Unicode MS", 11, 0, -1, 12, HINTING_THRESHOLD_LOW, nullptr }, } }; + +TTFFontSetDescriptor TTFFontMicroHei = { { + { "wqy-microhei.ttc", "WenQuanYi Micro Hei", 10, -1, -1, 10, HINTING_THRESHOLD_MEDIUM, nullptr }, + { "wqy-microhei.ttc", "WenQuanYi Micro Hei", 11, 1, -1, 14, HINTING_THRESHOLD_MEDIUM, nullptr }, + { "wqy-microhei.ttc", "WenQuanYi Micro Hei", 11, 1, -2, 14, HINTING_THRESHOLD_MEDIUM, nullptr }, +} }; // clang-format on #endif // NO_TTF diff --git a/src/openrct2/interface/Fonts.h b/src/openrct2/interface/Fonts.h index af8ec51d50..25be04206b 100644 --- a/src/openrct2/interface/Fonts.h +++ b/src/openrct2/interface/Fonts.h @@ -28,6 +28,7 @@ extern TTFFontSetDescriptor TTFFontGulim; extern TTFFontSetDescriptor TTFFontNanum; extern TTFFontSetDescriptor TTFFontArial; extern TTFFontSetDescriptor TTFFontArialUnicode; +extern TTFFontSetDescriptor TTFFontMicroHei; # define FONT(x) x #else # define FONT(x) FONT_OPENRCT2_SPRITE