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

fix inlined fonts again. 

SVN revision: 53258
This commit is contained in:
Carsten Haitzler 2010-10-11 07:24:46 +00:00
parent 1cae896bba
commit f1ec894769
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
legacy/edje/src/lib/edje_calc.c
View File

@ -845,15 +845,21 @@ _edje_part_recalc_single_text(FLOAT_T sc,
if (fnt)
{
int len = strlen(fnt->entry) + sizeof("edje/fonts/") + 1;
font = alloca(len);
sprintf((char *)font, "edje/fonts/%s", fnt->entry);
char *font2;
int len = strlen(font) + sizeof("edje/fonts/") + 1;
font2 = alloca(len);
sprintf(font2, "edje/fonts/%s", font);
font = font2;
inlined_font = 1;
}
}
if (ep->part->scale)
evas_object_scale_set(ep->object, TO_DOUBLE(sc));
if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path);
if (inlined_font)
{
evas_object_text_font_source_set(ep->object, ed->path);
}
else evas_object_text_font_source_set(ep->object, NULL);
if ((_edje_fontset_append) && (font))

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

@ -342,9 +342,11 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
if (fnt)
{
int len = strlen(fnt->entry) + sizeof("edje/fonts/") + 1;
font = alloca(len);
sprintf((char *)font, "edje/fonts/%s", fnt->entry);
char *font2;
int len = strlen(font) + sizeof("edje/fonts/") + 1;
font2 = alloca(len);
font = font2;
inlined_font = 1;
}
}