Evas font-engine: Fixed rendering of empty text.

SVN revision: 59006
This commit is contained in:
Tom Hacohen 2011-04-28 15:02:11 +00:00
parent c5b107f144
commit 5570891eb3
1 changed files with 20 additions and 14 deletions

View File

@ -525,6 +525,8 @@ 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;
if (fi)
{
evas_common_font_int_reload(fi); evas_common_font_int_reload(fi);
if (fi->src->current_size != fi->size) if (fi->src->current_size != fi->size)
@ -534,6 +536,7 @@ evas_common_font_draw_internal(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font
FTUNLOCK(); FTUNLOCK();
fi->src->current_size = fi->size; fi->src->current_size = fi->size;
} }
}
#endif #endif
EVAS_FONT_WALK_TEXT_START() EVAS_FONT_WALK_TEXT_START()
@ -844,6 +847,8 @@ 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;
if (fi)
{
evas_common_font_int_reload(fi); evas_common_font_int_reload(fi);
if (fi->src->current_size != fi->size) if (fi->src->current_size != fi->size)
@ -853,6 +858,7 @@ evas_font_word_prerender(RGBA_Draw_Context *dc, const Eina_Unicode *in_text, con
FTUNLOCK(); FTUNLOCK();
fi->src->current_size = fi->size; fi->src->current_size = fi->size;
} }
}
#endif #endif
/* First pass: Work out how big and populate */ /* First pass: Work out how big and populate */