Skip to content

Commit 3030235

Browse files
committed
Revert "Fix font breaking issues (flutter-tizen#69)"
This reverts commit 28dbd02.
1 parent f125217 commit 3030235

3 files changed

Lines changed: 4 additions & 60 deletions

File tree

azure-pipelines.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ jobs:
7676
--target-sysroot `pwd`/tizen_tools/sysroot/$(arch) \
7777
--target-triple $(targetTriple) \
7878
--runtime-mode $(mode) \
79+
--enable-fontconfig
7980
--embedder-for-target \
8081
--disable-desktop-embeddings \
8182
--build-tizen-shell

third_party/txt/src/txt/font_collection.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ FontCollection::GetMinikinFontCollectionForFamilies(
187187
FindFontFamilyInManagers(family);
188188
if (minikin_family != nullptr) {
189189
minikin_families.push_back(minikin_family);
190+
break;
190191
}
191192
}
192193
}

third_party/txt/src/txt/platform_linux.cc

Lines changed: 2 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -13,72 +13,14 @@
1313
namespace txt {
1414

1515
std::vector<std::string> GetDefaultFontFamilies() {
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-
};
16+
return {"SamsungOneUI", "BreezeSans", "Ubuntu", "Cantarell", "DejaVu Sans", "Liberation Sans", "Arial"};
7517
}
7618

7719
sk_sp<SkFontMgr> GetDefaultFontManager() {
7820
#ifdef FLUTTER_USE_FONTCONFIG
7921
return SkFontMgr_New_FontConfig(nullptr);
8022
#else
81-
return SkFontMgr_New_Custom_Directory("/usr/share/");
23+
return SkFontMgr_New_Custom_Directory("/usr/share/fonts/");
8224
#endif
8325
}
8426

0 commit comments

Comments
 (0)