enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Evas text: Fixed a segfault with text objects with a font not yet set (but with text set). 

SVN revision: 56537
This commit is contained in:
Tom Hacohen 2011-01-30 10:45:17 +00:00
parent df727d6772
commit a98aaaae64
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
legacy/evas/src/lib/canvas/evas_object_text.c
View File

@ -530,12 +530,15 @@ _evas_object_text_item_new(Evas_Object *obj, Evas_Object_Text *o,
evas_common_text_props_script_set(&it->text_props, it->text);
ENFN->font_shape(ENDT, o->engine_data, it->text, &it->text_props,
o->bidi_par_props, it->text_pos, len);
ENFN->font_string_size_get(ENDT,
o->engine_data,
it->text, &it->text_props,
&it->w, &it->h);
it->adv = ENFN->font_h_advance_get(ENDT, o->engine_data, it->text,
&it->text_props);
if (o->engine_data)
{
ENFN->font_string_size_get(ENDT,
o->engine_data,
it->text, &it->text_props,
&it->w, &it->h);
it->adv = ENFN->font_h_advance_get(ENDT, o->engine_data, it->text,
&it->text_props);
}
o->items = (Evas_Object_Text_Item *)
eina_inlist_append(EINA_INLIST_GET(o->items), EINA_INLIST_GET(it));
return it;