billiob pushed a commit to branch efl-1.18.

http://git.enlightenment.org/core/efl.git/commit/?id=cc95efb01557cfea91f1a3473178c2bf0fbe3a24

commit cc95efb01557cfea91f1a3473178c2bf0fbe3a24
Author: Boris Faure <[email protected]>
Date:   Sat Aug 13 00:29:05 2016 +0200

    evas textgrid: unset style when trying to load bold/italic
    
    Ref T4323
    
    @fix
---
 src/lib/evas/canvas/evas_object_textgrid.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/lib/evas/canvas/evas_object_textgrid.c 
b/src/lib/evas/canvas/evas_object_textgrid.c
index d5be2ed..2dd96a4 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -1156,6 +1156,10 @@ _evas_textgrid_efl_text_properties_font_set(Eo *eo_obj,
        (fdesc->weight == EVAS_FONT_WEIGHT_BOOK))
      {
         Evas_Font_Description *bold_desc = evas_font_desc_dup(fdesc);
+
+        eina_stringshare_del(bold_desc->style);
+        bold_desc->style = NULL;
+
         bold_desc->weight = EVAS_FONT_WEIGHT_BOLD;
         _alternate_font_weight_slant(obj, o, &o->font_bold, bold_desc,
                                      "bold");
@@ -1173,6 +1177,9 @@ _evas_textgrid_efl_text_properties_font_set(Eo *eo_obj,
         Evas_Font_Description *italic_desc = evas_font_desc_dup(fdesc);
         int ret;
 
+        eina_stringshare_del(italic_desc->style);
+        italic_desc->style = NULL;
+
         italic_desc->slant = EVAS_FONT_SLANT_ITALIC;
         ret = _alternate_font_weight_slant(obj, o, &o->font_italic,
                                            italic_desc, "italic");
@@ -1199,6 +1206,9 @@ _evas_textgrid_efl_text_properties_font_set(Eo *eo_obj,
         Evas_Font_Description *bolditalic_desc = evas_font_desc_dup(fdesc);
         int ret;
 
+        eina_stringshare_del(bolditalic_desc->style);
+        bolditalic_desc->style = NULL;
+
         bolditalic_desc->slant = EVAS_FONT_SLANT_ITALIC;
         bolditalic_desc->weight = EVAS_FONT_WEIGHT_BOLD;
         ret = _alternate_font_weight_slant(obj, o, &o->font_bolditalic,

-- 


Reply via email to