diff options
| author | Daniel Hirt <hirt.danny@gmail.com> | 2017-10-08 14:00:24 +0300 |
|---|---|---|
| committer | Daniel Hirt <hirt.danny@gmail.com> | 2017-11-06 15:35:00 +0200 |
| commit | b159dc156a0d6ffdae80074bf73c638c726057ca (patch) | |
| tree | 8934870ee71267158c26a5fe3650ffdcd16da267 | |
| parent | 68b366c83175458a67c0655519a44d1ea1a48419 (diff) | |
| download | efl-b159dc156a0d6ffdae80074bf73c638c726057ca.tar.gz | |
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");
| -rw-r--r-- | src/lib/evas/canvas/evas_object_textblock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index c311b58909..45063b3951 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -3381,7 +3381,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), @@ -3392,6 +3391,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->evas, fmt->font.fdesc, fmt->font.source, (int)(((double) _FMT_INFO(size)) * evas_obj->cur->scale), fmt->font.bitmap_scalable); } |