summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoungbok Shin <youngb.shin@samsung.com>2017-07-11 15:46:03 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-07-11 17:09:44 +0900
commit5ebe082415317fe0deb6081c3a5085f2c0d1e111 (patch)
treeafc9fcec97a7aaba4436f69dd60bf837eabfb233
parentdf209613538178ba24d91d1a6d3ed534df342378 (diff)
downloadefl-5ebe082415317fe0deb6081c3a5085f2c0d1e111.tar.gz
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
-rw-r--r--src/lib/evas/canvas/evas_font_dir.c10
1 files changed, 9 insertions, 1 deletions
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
}