jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5e5e408e581ea234ef4d5e2dca5c4cbded1a0497
commit 5e5e408e581ea234ef4d5e2dca5c4cbded1a0497
Author: Youngbok Shin <youngb.s...@samsung.com>
Date: Tue Jul 11 15:46:03 2017 +0900
evas font: append global font path when Evas initializes Fontconfig
Summary:
If there are appended font pathes before initializing Fontconfig,
Evas must care the font pathes after initializing Fontconfig.
@fix
Test Plan:
1. Call evas_font_path_global_append() with a private font path
before adding any Evas Object.
2. Add a Evas Textblock object which uses a font from the private font path.
3. See the font is not loaded properly without the patch.
Reviewers: raster, cedric, herdsman, jpeg, woohyun
Differential Revision: https://phab.enlightenment.org/D4867
---
src/lib/evas/canvas/evas_font_dir.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/lib/evas/canvas/evas_font_dir.c
b/src/lib/evas/canvas/evas_font_dir.c
index 2f4c8598ba..361e0fdb79 100644
--- a/src/lib/evas/canvas/evas_font_dir.c
+++ b/src/lib/evas/canvas/evas_font_dir.c
@@ -61,7 +61,15 @@ evas_font_init(void)
{
#ifdef HAVE_FONTCONFIG
if (!fc_config)
- fc_config = FcInitLoadConfigAndFonts();
+ {
+ Eina_List *l;
+ char *path;
+
+ fc_config = FcInitLoadConfigAndFonts();
+
+ EINA_LIST_FOREACH(global_font_path, l, path)
+ FcConfigAppFontAddDir(fc_config, (const FcChar8 *) path);
+ }
#endif
}
--
