dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

text badness fix 

SVN revision: 18631
This commit is contained in:
Carsten Haitzler 2005-11-24 08:10:22 +00:00
parent 59bbe6cf2d
commit 7278f1d18b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
legacy/edje/src/lib/edje_text.c
View File

@ -514,9 +514,6 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
font = chosen_desc->text.font;
size = chosen_desc->text.size;
if (!text) text = "";
if (!font) font = "";
if ((chosen_desc->text.text_class) && (chosen_desc->text.text_class[0] != 0))
{
Edje_Text_Class *tc;
@ -533,6 +530,9 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
if (ep->text.font) font = ep->text.font;
if (ep->text.size > 0) size = ep->text.size;
if (!text) text = "";
if (!font) font = "";
/* check if the font is embedded in the .eet */
/* FIXME: we should cache this result */
if (ed->file->font_dir)
@ -583,6 +583,9 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
{
text = ep->text.cache.out_str;
size = ep->text.cache.out_size;
if (!text) text = "";
goto arrange_text;
}
if (ep->text.cache.in_str) free(ep->text.cache.in_str);