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

promote scale to fp. 

SVN revision: 35920
This commit is contained in:
Carsten Haitzler 2008-09-10 05:43:25 +00:00
parent 7292d49894
commit c1d838efa7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,7 +191,7 @@ evas_object_text_font_set(Evas_Object *obj, const char *font, Evas_Font_Size siz
evas_font_free(obj->layer->evas, o->engine_data);
o->engine_data = NULL;
}
o->engine_data = evas_font_load(obj->layer->evas, font, o->cur.source, size * obj->cur.scale);
o->engine_data = evas_font_load(obj->layer->evas, font, o->cur.source, (int)(((double)size) * obj->cur.scale));
if (!same_font)
{
if (o->cur.font) evas_stringshare_del(o->cur.font);

4
legacy/evas/src/lib/canvas/evas_object_textblock.c
View File

@ -1170,7 +1170,7 @@ _format_command(Evas_Object *obj, Evas_Object_Textblock_Format *fmt, const char
buf = strdup(fmt->font.name);
fmt->font.font = evas_font_load(obj->layer->evas,
buf, fmt->font.source,
fmt->font.size * obj->cur.scale);
(int)(((double)fmt->font.size) * obj->cur.scale));
if (buf) free(buf);
if (of) evas_font_free(obj->layer->evas, of);
}
@ -1291,7 +1291,7 @@ _format_dup(Evas_Object *obj, Evas_Object_Textblock_Format *fmt)
buf = strdup(fmt2->font.name);
fmt2->font.font = evas_font_load(obj->layer->evas,
buf, fmt2->font.source,
fmt2->font.size * obj->cur.scale);
(int)(((double)fmt2->font.size) * obj->cur.scale));
if (buf) free(buf);
return fmt2;
}