cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a80209a59eefe1a77f630c111a00a512c492825a
commit a80209a59eefe1a77f630c111a00a512c492825a Author: Daniel Hirt <[email protected]> Date: Sun Oct 8 14:00:24 2017 +0300 Canvas text: favor font name parsing over set properties Since font names can also specify styles like weight, width etc, we should parse the font name AFTER setting the respective properties to the font description, so it can override some if required. This allows, for example, the following operation: efl_text_font_weight_set(obj, EFL_TEXT_FONT_WEIGHT_NORMAL); efl_text_font_set(obj, "Sans:Bold"); Signed-off-by: Cedric BAIL <[email protected]> --- src/lib/evas/canvas/evas_object_textblock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 0b375e41d5..251d1add48 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -3385,7 +3385,6 @@ _layout_format_push(Ctxt *c, Evas_Object_Textblock_Format *fmt, } fmt->font.fdesc = evas_font_desc_new(); - evas_font_name_parse(fmt->font.fdesc, _FMT_INFO(font)); eina_stringshare_replace(&(fmt->font.fdesc->lang), evas_font_lang_normalize("auto")); eina_stringshare_replace(&(fmt->font.fdesc->fallbacks), @@ -3396,6 +3395,7 @@ _layout_format_push(Ctxt *c, Evas_Object_Textblock_Format *fmt, fmt->font.fdesc->slant = _FMT_INFO(font_slant); fmt->font.fdesc->width = _FMT_INFO(font_width); fmt->font.fdesc->lang = _FMT_INFO(font_lang); + evas_font_name_parse(fmt->font.fdesc, _FMT_INFO(font)); fmt->font.font = evas_font_load(evas_obj->layer->evas->font_path, evas_obj->layer->evas->hinting, fmt->font.fdesc, --
