File tree 5 files changed +19
-1
lines changed
5 files changed +19
-1
lines changed Original file line number Diff line number Diff line change @@ -99,6 +99,7 @@ size_t FontCollection::GetFontManagersCount() const {
99
99
100
100
void FontCollection::SetupDefaultFontManager () {
101
101
default_font_manager_ = GetDefaultFontManager ();
102
+ fallback_font_manager_ = GetFallbackFontManager ();
102
103
}
103
104
104
105
void FontCollection::SetDefaultFontManager (sk_sp<SkFontMgr> font_manager) {
@@ -144,6 +145,8 @@ std::vector<sk_sp<SkFontMgr>> FontCollection::GetFontManagerOrder() const {
144
145
order.push_back (test_font_manager_);
145
146
if (default_font_manager_)
146
147
order.push_back (default_font_manager_);
148
+ if (fallback_font_manager_)
149
+ order.push_back (fallback_font_manager_);
147
150
return order;
148
151
}
149
152
Original file line number Diff line number Diff line change @@ -91,6 +91,7 @@ class FontCollection : public std::enable_shared_from_this<FontCollection> {
91
91
};
92
92
93
93
sk_sp<SkFontMgr> default_font_manager_;
94
+ sk_sp<SkFontMgr> fallback_font_manager_;
94
95
sk_sp<SkFontMgr> asset_font_manager_;
95
96
sk_sp<SkFontMgr> dynamic_font_manager_;
96
97
sk_sp<SkFontMgr> test_font_manager_;
Original file line number Diff line number Diff line change @@ -14,4 +14,8 @@ sk_sp<SkFontMgr> GetDefaultFontManager() {
14
14
return SkFontMgr::RefDefault ();
15
15
}
16
16
17
+ sk_sp<SkFontMgr> GetFallbackFontManager () {
18
+ return nullptr ;
19
+ }
20
+
17
21
} // namespace txt
Original file line number Diff line number Diff line change @@ -17,6 +17,8 @@ std::vector<std::string> GetDefaultFontFamilies();
17
17
18
18
sk_sp<SkFontMgr> GetDefaultFontManager ();
19
19
20
+ sk_sp<SkFontMgr> GetFallbackFontManager ();
21
+
20
22
} // namespace txt
21
23
22
24
#endif // TXT_PLATFORM_H_
Original file line number Diff line number Diff line change @@ -78,7 +78,15 @@ sk_sp<SkFontMgr> GetDefaultFontManager() {
78
78
#ifdef FLUTTER_USE_FONTCONFIG
79
79
return SkFontMgr_New_FontConfig (nullptr );
80
80
#else
81
- return SkFontMgr_New_Custom_Directory (" /usr/share/" );
81
+ return SkFontMgr_New_Custom_Directory (" /usr/share/fonts" );
82
+ #endif
83
+ }
84
+
85
+ sk_sp<SkFontMgr> GetFallbackFontManager () {
86
+ #ifdef FLUTTER_USE_FONTCONFIG
87
+ return nullptr ;
88
+ #else
89
+ return SkFontMgr_New_Custom_Directory (" /usr/share/fallback_fonts" );
82
90
#endif
83
91
}
84
92
You can’t perform that action at this time.
0 commit comments