forked from enlightenment/efl
ensure scaling multiplies are promoted to fp.
SVN revision: 35924
This commit is contained in:
parent
673efdedd5
commit
0cf0cd8e15
|
@ -191,7 +191,6 @@ evas_object_text_font_set(Evas_Object *obj, const char *font, Evas_Font_Size siz
|
||||||
evas_font_free(obj->layer->evas, o->engine_data);
|
evas_font_free(obj->layer->evas, o->engine_data);
|
||||||
o->engine_data = NULL;
|
o->engine_data = NULL;
|
||||||
}
|
}
|
||||||
o->engine_data = evas_font_load(obj->layer->evas, font, o->cur.source, (int)(((double)size) * obj->cur.scale));
|
|
||||||
if (!same_font)
|
if (!same_font)
|
||||||
{
|
{
|
||||||
if (o->cur.font) evas_stringshare_del(o->cur.font);
|
if (o->cur.font) evas_stringshare_del(o->cur.font);
|
||||||
|
@ -200,6 +199,8 @@ evas_object_text_font_set(Evas_Object *obj, const char *font, Evas_Font_Size siz
|
||||||
o->prev.font = NULL;
|
o->prev.font = NULL;
|
||||||
}
|
}
|
||||||
o->cur.size = size;
|
o->cur.size = size;
|
||||||
|
o->engine_data = evas_font_load(obj->layer->evas, o->cur.font, o->cur.source,
|
||||||
|
(int)(((double)o->cur.size) * obj->cur.scale));
|
||||||
evas_text_style_pad_get(o->cur.style, &l, &r, &t, &b);
|
evas_text_style_pad_get(o->cur.style, &l, &r, &t, &b);
|
||||||
if ((o->engine_data) && (o->cur.text))
|
if ((o->engine_data) && (o->cur.text))
|
||||||
{
|
{
|
||||||
|
|
|
@ -1168,6 +1168,7 @@ _format_command(Evas_Object *obj, Evas_Object_Textblock_Format *fmt, const char
|
||||||
}
|
}
|
||||||
else if (fmt->font.name)
|
else if (fmt->font.name)
|
||||||
buf = strdup(fmt->font.name);
|
buf = strdup(fmt->font.name);
|
||||||
|
|
||||||
fmt->font.font = evas_font_load(obj->layer->evas,
|
fmt->font.font = evas_font_load(obj->layer->evas,
|
||||||
buf, fmt->font.source,
|
buf, fmt->font.source,
|
||||||
(int)(((double)fmt->font.size) * obj->cur.scale));
|
(int)(((double)fmt->font.size) * obj->cur.scale));
|
||||||
|
@ -1290,7 +1291,7 @@ _format_dup(Evas_Object *obj, Evas_Object_Textblock_Format *fmt)
|
||||||
else if (fmt2->font.name)
|
else if (fmt2->font.name)
|
||||||
buf = strdup(fmt2->font.name);
|
buf = strdup(fmt2->font.name);
|
||||||
fmt2->font.font = evas_font_load(obj->layer->evas,
|
fmt2->font.font = evas_font_load(obj->layer->evas,
|
||||||
buf, fmt2->font.source,
|
buf, fmt2->font.source,
|
||||||
(int)(((double)fmt2->font.size) * obj->cur.scale));
|
(int)(((double)fmt2->font.size) * obj->cur.scale));
|
||||||
if (buf) free(buf);
|
if (buf) free(buf);
|
||||||
return fmt2;
|
return fmt2;
|
||||||
|
|
Loading…
Reference in New Issue