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

rephorm missed another place fonts were being set, and forgot to include the 

compiler side to list the fonts... :)


SVN revision: 11441
This commit is contained in:
Carsten Haitzler 2004-08-30 08:07:00 +00:00
parent 0cccbd1d40
commit 2f972d6555
3 changed files with 60 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
legacy/edje/src/bin/edje_cc_handlers.c
View File

@ -311,11 +311,21 @@ static void
st_fonts_font(void)
{
Font *fn;
Edje_Font_Directory_Entry *fnt;
fn = calloc(1, sizeof(Font));
fn->file = parse_str(0);
fn->name = parse_str(1);
fonts = evas_list_append(fonts, fn);
if (!edje_file->font_dir)
edje_file->font_dir = calloc(1, sizeof(Edje_Font_Directory));
fnt = calloc(1, sizeof(Edje_Font_Directory_Entry));
fnt->entry = strdup(fn->name);
edje_file->font_dir->entries =
evas_list_append(edje_file->font_dir->entries, fnt);
}
static void

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

@ -508,7 +508,7 @@ _edje_part_recalc_single(Edje *ed,
int size;
Evas_Coord tw, th;
char buf[4096];
Evas_List *l;
int inlined_font = 0;
text = chosen_desc->text.text;
font = chosen_desc->text.font;
@ -535,19 +535,25 @@ _edje_part_recalc_single(Edje *ed,
/* FIXME: we should cache this result */
if (ed->file->font_dir)
{
Evas_List *l;
for (l = ed->file->font_dir->entries; l; l = l->next)
{
Edje_Font_Directory_Entry *fnt = l->data;
if (!strcmp(fnt->entry, font))
if ((fnt->entry) && (!strcmp(fnt->entry, font)))
{
strcpy(buf, "fonts/");
strcat(buf, font);
font = buf;
inlined_font = 1;
break;
}
}
}
if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path);
else evas_object_text_font_source_set(ep->object, NULL);
evas_object_text_font_set(ep->object, font, size);
if ((chosen_desc->text.min_x) || (chosen_desc->text.min_y))
{

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

@ -185,7 +185,7 @@ _edje_text_part_on_add(Edje *ed, Edje_Real_Part *ep)
Evas_Object *o;
o = evas_object_text_add(ed->evas);
evas_object_text_font_source_set(o, ed->path);
// evas_object_text_font_source_set(o, ed->path);
evas_object_smart_member_add(o, ed->obj);
evas_object_pass_events_set(o, 1);
evas_object_clip_set(o, ed->clipper);
@ -293,6 +293,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
Evas_Coord ox, oy, sw, sh;
char *buf = NULL;
char buf2[4096];
int inlined_font = 0;
text = chosen_desc->text.text;
font = chosen_desc->text.font;
@ -314,13 +316,26 @@ _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;
strcpy(buf2, "fonts/");
strcat(buf2, font);
evas_object_text_font_set(ep->object, buf2, 10);
if (evas_object_text_ascent_get(ep->object) > 0) font = buf2;
// font = buf2;
/* check if the font is embedded in the .eet */
/* FIXME: we should cache this result */
if (ed->file->font_dir)
{
Evas_List *l;
for (l = ed->file->font_dir->entries; l; l = l->next)
{
Edje_Font_Directory_Entry *fnt = l->data;
if ((fnt->entry) && (!strcmp(fnt->entry, font)))
{
strcpy(buf2, "fonts/");
strcat(buf2, font);
font = buf2;
inlined_font = 1;
break;
}
}
}
ox = _edje_text_styles[ep->part->effect].offset.x;
oy = _edje_text_styles[ep->part->effect].offset.y;
@ -344,6 +359,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
ep->text.cache.in_size = size;
if (chosen_desc->text.fit_x)
{
if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path);
else evas_object_text_font_source_set(ep->object, NULL);
evas_object_text_font_set(ep->object, font, size);
evas_object_text_text_set(ep->object, text);
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
@ -357,6 +374,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
psize = size;
size = (size * sw) / tw;
if ((psize - size) <= 0) size = psize - 1;
if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path);
else evas_object_text_font_source_set(ep->object, NULL);
evas_object_text_font_set(ep->object, font, size);
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
if ((size > 0) && (tw == 0)) break;
@ -372,6 +391,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
psize = size;
size = (size * sw) / tw;
if ((psize - size) >= 0) size = psize + 1;
if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path);
else evas_object_text_font_source_set(ep->object, NULL);
evas_object_text_font_set(ep->object, font, size);
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
if ((size > 0) && (tw == 0)) break;
@ -382,6 +403,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
if (chosen_desc->text.fit_y)
{
size = sh;
if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path);
else evas_object_text_font_source_set(ep->object, NULL);
evas_object_text_font_set(ep->object, font, size);
evas_object_text_text_set(ep->object, text);
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
@ -395,6 +418,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
{
size += dif;
if (size <= 0) break;
if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path);
else evas_object_text_font_source_set(ep->object, NULL);
evas_object_text_font_set(ep->object, font, size);
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
if ((size > 0) && (th == 0)) break;
@ -411,6 +436,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
{
size -= dif;
if (size <= 0) break;
if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path);
else evas_object_text_font_source_set(ep->object, NULL);
evas_object_text_font_set(ep->object, font, size);
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
if ((size > 0) && (th == 0)) break;
@ -425,6 +452,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
int loop;
int orig_len;
if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path);
else evas_object_text_font_source_set(ep->object, NULL);
evas_object_text_font_set(ep->object, font, size);
evas_object_text_text_set(ep->object, text);
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
@ -549,6 +578,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
arrange_text:
if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path);
else evas_object_text_font_source_set(ep->object, NULL);
evas_object_text_font_set(ep->object, font, size);
evas_object_text_text_set(ep->object, text);
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
@ -574,6 +605,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
Evas_Object *o;
o = l->data;
if (inlined_font) evas_object_text_font_source_set(o, ed->path);
else evas_object_text_font_source_set(o, NULL);
evas_object_text_font_set(o, font, size);
evas_object_text_text_set(o, text);
evas_object_move(o,