forked from enlightenment/efl
Evas font-engine: Fixed rendering of empty text.
SVN revision: 59006
This commit is contained in:
parent
c5b107f144
commit
5570891eb3
|
@ -525,14 +525,17 @@ evas_common_font_draw_internal(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font
|
||||||
/* FIXME-tom: Should be applied to non-ot as well once we are capable of
|
/* FIXME-tom: Should be applied to non-ot as well once we are capable of
|
||||||
* doing it */
|
* doing it */
|
||||||
fi = text_props->font_instance;
|
fi = text_props->font_instance;
|
||||||
evas_common_font_int_reload(fi);
|
if (fi)
|
||||||
|
|
||||||
if (fi->src->current_size != fi->size)
|
|
||||||
{
|
{
|
||||||
FTLOCK();
|
evas_common_font_int_reload(fi);
|
||||||
FT_Activate_Size(fi->ft.size);
|
|
||||||
FTUNLOCK();
|
if (fi->src->current_size != fi->size)
|
||||||
fi->src->current_size = fi->size;
|
{
|
||||||
|
FTLOCK();
|
||||||
|
FT_Activate_Size(fi->ft.size);
|
||||||
|
FTUNLOCK();
|
||||||
|
fi->src->current_size = fi->size;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -844,14 +847,17 @@ evas_font_word_prerender(RGBA_Draw_Context *dc, const Eina_Unicode *in_text, con
|
||||||
/* FIXME-tom: Should be applied to non-ot as well once we are capable of
|
/* FIXME-tom: Should be applied to non-ot as well once we are capable of
|
||||||
* doing it */
|
* doing it */
|
||||||
fi = text_props->font_instance;
|
fi = text_props->font_instance;
|
||||||
evas_common_font_int_reload(fi);
|
if (fi)
|
||||||
|
|
||||||
if (fi->src->current_size != fi->size)
|
|
||||||
{
|
{
|
||||||
FTLOCK();
|
evas_common_font_int_reload(fi);
|
||||||
FT_Activate_Size(fi->ft.size);
|
|
||||||
FTUNLOCK();
|
if (fi->src->current_size != fi->size)
|
||||||
fi->src->current_size = fi->size;
|
{
|
||||||
|
FTLOCK();
|
||||||
|
FT_Activate_Size(fi->ft.size);
|
||||||
|
FTUNLOCK();
|
||||||
|
fi->src->current_size = fi->size;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue