Fix font breaking issues (#69)

* Allow multiple default fonts for localizations * Update fallback fonts from tv profile * Add fonts in wearable and tv emulator
flutter-tizen · Feb 11, 2022 · 75a390d · 75a390d
1 parent 17a15aa
commit 75a390d
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 5 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -66,7 +66,6 @@ jobs:
         --target-sysroot `pwd`/tizen_tools/sysroot/$(arch) \
         --target-triple $(targetTriple) \
         --runtime-mode $(mode) \
-        --enable-fontconfig \
         --embedder-for-target \
         --disable-desktop-embeddings \
         --build-tizen-shell \
@@ -83,7 +82,6 @@ jobs:
         --target-sysroot `pwd`/tizen_tools/sysroot/$(arch)_40 \
         --target-triple $(targetTriple) \
         --runtime-mode $(mode) \
-        --enable-fontconfig \
         --embedder-for-target \
         --disable-desktop-embeddings \
         --build-tizen-shell \

diff --git a/third_party/txt/src/txt/font_collection.cc b/third_party/txt/src/txt/font_collection.cc
@@ -188,7 +188,6 @@ FontCollection::GetMinikinFontCollectionForFamilies(
           FindFontFamilyInManagers(family);
       if (minikin_family != nullptr) {
         minikin_families.push_back(minikin_family);
-        break;
       }
     }
   }

diff --git a/third_party/txt/src/txt/platform_linux.cc b/third_party/txt/src/txt/platform_linux.cc
@@ -13,14 +13,72 @@
 namespace txt {
 
 std::vector<std::string> GetDefaultFontFamilies() {
-  return {"SamsungOneUI", "BreezeSans", "Ubuntu", "Cantarell", "DejaVu Sans", "Liberation Sans", "Arial"};
+  return {
+      "SamsungOneUI",
+      "SamsungOneUIArabic",
+      "SamsungOneUIArmenian",
+      "SamsungOneUIBangla",
+      "SamsungOneUIDevanagari",
+      "SamsungOneUIEthiopic",
+      "SamsungOneUIFallback",
+      "SamsungOneUIGeorgian",
+      "SamsungOneUIGujarati",
+      "SamsungOneUIGurmukhi",
+      "SamsungOneUIHebrew",
+      "SamsungOneUIJP",
+      "SamsungOneUIKannada",
+      "SamsungOneUIKhmer",
+      "SamsungOneUIKorean",
+      "SamsungOneUIKoreanH",
+      "SamsungOneUILao",
+      "SamsungOneUIMalayalam",
+      "SamsungOneUIMyanmar",
+      "SamsungOneUIOdia",
+      "SamsungOneUIOlChiki",
+      "SamsungOneUISCN",
+      "SamsungOneUISinhala",
+      "SamsungOneUITCN",
+      "SamsungOneUITagalog",
+      "SamsungOneUITamil",
+      "SamsungOneUITelugu",
+      "SamsungOneUIThai",
+      "SamsungOneFallback",
+      "SECEmoji",
+      "BreezeSans",
+      "BreezeSansArabic",
+      "BreezeSansArmenian",
+      "BreezeSansBengali",
+      "BreezeSansChinese",
+      "BreezeSansEthiopic",
+      "BreezeSansGeorgian",
+      "BreezeSansGujarathi",
+      "BreezeSansHebrew",
+      "BreezeSansHindi",
+      "BreezeSansJapanese",
+      "BreezeSansKannada",
+      "BreezeSansKhmer",
+      "BreezeSansKorean",
+      "BreezeSansLao",
+      "BreezeSansMalayalam",
+      "BreezeSansMeeteiMayek",
+      "BreezeSansMyanmar",
+      "BreezeSansOriya",
+      "BreezeSansPunjabi",
+      "BreezeSansSinhala",
+      "BreezeSansTamilBreezeSansTamil",
+      "BreezeSansTelugu",
+      "BreezeSansThai",
+      "BreezeSansTibetan",
+      "BreezeSansFallback",
+      "BreezeColorEmoji",
+  };
 }
 
 sk_sp<SkFontMgr> GetDefaultFontManager(uint32_t font_initialization_data) {
 #ifdef FLUTTER_USE_FONTCONFIG
   return SkFontMgr_New_FontConfig(nullptr);
 #else
-  return SkFontMgr_New_Custom_Directory("/usr/share/fonts/");
+  return SkFontMgr_New_Custom_Directory("/usr/share/");
 #endif
 }