Skip to content

Commit 5552dd5

Browse files
HakkyuKimswift-kim
authored andcommitted
Fix font breaking issues (flutter-tizen#69)
* Allow multiple default fonts for localizations * Update fallback fonts from tv profile * Add fonts in wearable and tv emulator + adjust azure pipeline
1 parent 83a8062 commit 5552dd5

File tree

3 files changed

+60
-5
lines changed

3 files changed

+60
-5
lines changed

azure-pipelines.yml

-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ jobs:
6666
--target-sysroot `pwd`/tizen_tools/sysroot/$(arch) \
6767
--target-triple $(targetTriple) \
6868
--runtime-mode $(mode) \
69-
--enable-fontconfig \
7069
--embedder-for-target \
7170
--disable-desktop-embeddings \
7271
--build-tizen-shell \
@@ -83,7 +82,6 @@ jobs:
8382
--target-sysroot `pwd`/tizen_tools/sysroot/$(arch)_40 \
8483
--target-triple $(targetTriple) \
8584
--runtime-mode $(mode) \
86-
--enable-fontconfig \
8785
--embedder-for-target \
8886
--disable-desktop-embeddings \
8987
--build-tizen-shell \

third_party/txt/src/txt/font_collection.cc

-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ FontCollection::GetMinikinFontCollectionForFamilies(
187187
FindFontFamilyInManagers(family);
188188
if (minikin_family != nullptr) {
189189
minikin_families.push_back(minikin_family);
190-
break;
191190
}
192191
}
193192
}

third_party/txt/src/txt/platform_linux.cc

+60-2
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,72 @@
1313
namespace txt {
1414

1515
std::vector<std::string> GetDefaultFontFamilies() {
16-
return {"SamsungOneUI", "BreezeSans", "Ubuntu", "Cantarell", "DejaVu Sans", "Liberation Sans", "Arial"};
16+
return {
17+
"SamsungOneUI",
18+
"SamsungOneUIArabic",
19+
"SamsungOneUIArmenian",
20+
"SamsungOneUIBangla",
21+
"SamsungOneUIDevanagari",
22+
"SamsungOneUIEthiopic",
23+
"SamsungOneUIFallback",
24+
"SamsungOneUIGeorgian",
25+
"SamsungOneUIGujarati",
26+
"SamsungOneUIGurmukhi",
27+
"SamsungOneUIHebrew",
28+
"SamsungOneUIJP",
29+
"SamsungOneUIKannada",
30+
"SamsungOneUIKhmer",
31+
"SamsungOneUIKorean",
32+
"SamsungOneUIKoreanH",
33+
"SamsungOneUILao",
34+
"SamsungOneUIMalayalam",
35+
"SamsungOneUIMyanmar",
36+
"SamsungOneUIOdia",
37+
"SamsungOneUIOlChiki",
38+
"SamsungOneUISCN",
39+
"SamsungOneUISinhala",
40+
"SamsungOneUITCN",
41+
"SamsungOneUITagalog",
42+
"SamsungOneUITamil",
43+
"SamsungOneUITelugu",
44+
"SamsungOneUIThai",
45+
"SamsungOneFallback",
46+
"SECEmoji",
47+
"BreezeSans",
48+
"BreezeSansArabic",
49+
"BreezeSansArmenian",
50+
"BreezeSansBengali",
51+
"BreezeSansChinese",
52+
"BreezeSansEthiopic",
53+
"BreezeSansGeorgian",
54+
"BreezeSansGujarathi",
55+
"BreezeSansHebrew",
56+
"BreezeSansHindi",
57+
"BreezeSansJapanese",
58+
"BreezeSansKannada",
59+
"BreezeSansKhmer",
60+
"BreezeSansKorean",
61+
"BreezeSansLao",
62+
"BreezeSansMalayalam",
63+
"BreezeSansMeeteiMayek",
64+
"BreezeSansMyanmar",
65+
"BreezeSansOriya",
66+
"BreezeSansPunjabi",
67+
"BreezeSansSinhala",
68+
"BreezeSansTamilBreezeSansTamil",
69+
"BreezeSansTelugu",
70+
"BreezeSansThai",
71+
"BreezeSansTibetan",
72+
"BreezeSansFallback",
73+
"BreezeColorEmoji",
74+
};
1775
}
1876

1977
sk_sp<SkFontMgr> GetDefaultFontManager() {
2078
#ifdef FLUTTER_USE_FONTCONFIG
2179
return SkFontMgr_New_FontConfig(nullptr);
2280
#else
23-
return SkFontMgr_New_Custom_Directory("/usr/share/fonts/");
81+
return SkFontMgr_New_Custom_Directory("/usr/share/");
2482
#endif
2583
}
2684

0 commit comments

Comments
 (0)