From 895b8d30eac41afbdbd20efd65c5a6e58ae3f43d Mon Sep 17 00:00:00 2001 From: Jonathan Schwender <55576758+jschwe@users.noreply.github.com> Date: Thu, 28 Nov 2024 12:03:05 +0100 Subject: [PATCH] ohos: fonts: Fix HalfwidthandFullwidthForms font fallback (#34410) This codeblock contains chinese, japanese and korean characters, so we add the simplified chinese and the CJK fallback fonts. Additionally, we add the new CJK fallback font for the koren and japanese unicode blocks, since the KR and JP fallback fonts don't seem to be present on the latest OH versions anymore. Signed-off-by: Jonathan Schwender --- components/fonts/platform/freetype/ohos/font_list.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/components/fonts/platform/freetype/ohos/font_list.rs b/components/fonts/platform/freetype/ohos/font_list.rs index 5abe20339df..0c6d217b1ba 100644 --- a/components/fonts/platform/freetype/ohos/font_list.rs +++ b/components/fonts/platform/freetype/ohos/font_list.rs @@ -539,13 +539,21 @@ pub fn fallback_font_families(options: FallbackFontSelectionOptions) -> Vec<&'st UnicodeBlock::HangulJamoExtendedA | UnicodeBlock::HangulJamoExtendedB | UnicodeBlock::HangulSyllables => { + families.push("Noto Sans CJK"); + families.push("Noto Serif CJK"); families.push("Noto Sans KR"); }, UnicodeBlock::Hiragana | UnicodeBlock::Katakana | UnicodeBlock::KatakanaPhoneticExtensions => { + families.push("Noto Sans CJK"); + families.push("Noto Serif CJK"); families.push("Noto Sans JP"); }, + UnicodeBlock::HalfwidthandFullwidthForms => { + families.push("HarmonyOS Sans SC"); + families.push("Noto Sans CJK"); + }, _ => {}, } }