forked from enlightenment/efl
Evas engines: Adjust all the rest of the engines to use Evas_Font_Set.
SVN revision: 59784
This commit is contained in:
parent
228c7548a4
commit
a8ddf9b1f8
|
@ -389,7 +389,7 @@ eng_image_scale_hint_get(void *data __UNUSED__, void *image)
|
|||
}
|
||||
|
||||
static void
|
||||
eng_font_draw(void *data, void *context, void *surface, void *font, int x, int y, int w, int h, int ow, int oh, const Evas_Text_Props *intl_props)
|
||||
eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int x, int y, int w, int h, int ow, int oh, const Evas_Text_Props *intl_props)
|
||||
{
|
||||
Render_Engine *re = (Render_Engine *)data;
|
||||
RGBA_Image im;
|
||||
|
@ -403,7 +403,7 @@ eng_font_draw(void *data, void *context, void *surface, void *font, int x, int y
|
|||
evas_direct3d_font_texture_new,
|
||||
evas_direct3d_font_texture_free,
|
||||
evas_direct3d_font_texture_draw);
|
||||
evas_common_font_draw(&im, context, font, x, y, intl_props);
|
||||
evas_common_font_draw(&im, context, (RGBA_Font *) font, x, y, intl_props);
|
||||
evas_common_draw_context_font_ext_set(context, NULL, NULL, NULL, NULL);
|
||||
}
|
||||
|
||||
|
|
|
@ -822,7 +822,7 @@ eng_image_scale_hint_get(void *data __UNUSED__, void *image)
|
|||
}
|
||||
|
||||
static void
|
||||
eng_font_draw(void *data, void *context, void *surface, void *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *intl_props)
|
||||
eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *intl_props)
|
||||
{
|
||||
Render_Engine *re;
|
||||
|
||||
|
@ -842,7 +842,8 @@ eng_font_draw(void *data, void *context, void *surface, void *font, int x, int y
|
|||
evas_gl_font_texture_new,
|
||||
evas_gl_font_texture_free,
|
||||
evas_gl_font_texture_draw);
|
||||
evas_common_font_draw(im, context, font, x, y, intl_props);
|
||||
evas_common_font_draw(im, context, (RGBA_Font *) font, x, y,
|
||||
intl_props);
|
||||
evas_common_draw_context_font_ext_set(context,
|
||||
NULL,
|
||||
NULL,
|
||||
|
|
|
@ -2058,7 +2058,7 @@ eng_image_stride_get(void *data __UNUSED__, void *image, int *stride)
|
|||
}
|
||||
|
||||
static void
|
||||
eng_font_draw(void *data, void *context, void *surface, void *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *intl_props)
|
||||
eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *intl_props)
|
||||
{
|
||||
Render_Engine *re;
|
||||
|
||||
|
@ -2079,7 +2079,8 @@ eng_font_draw(void *data, void *context, void *surface, void *font, int x, int y
|
|||
evas_gl_font_texture_new,
|
||||
evas_gl_font_texture_free,
|
||||
evas_gl_font_texture_draw);
|
||||
evas_common_font_draw(im, context, font, x, y, intl_props);
|
||||
evas_common_font_draw(im, context, (RGBA_Font *) font, x, y,
|
||||
intl_props);
|
||||
evas_common_draw_context_font_ext_set(context,
|
||||
NULL,
|
||||
NULL,
|
||||
|
|
|
@ -291,7 +291,7 @@ eng_image_cache_get(void *data __UNUSED__)
|
|||
}
|
||||
|
||||
static void
|
||||
eng_font_draw(void *data __UNUSED__, void *context, void *surface, void *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *text_props)
|
||||
eng_font_draw(void *data __UNUSED__, void *context, void *surface, Evas_Font_Set *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *text_props)
|
||||
{
|
||||
static RGBA_Image *im = NULL;
|
||||
Soft16_Image *dst = surface;
|
||||
|
@ -304,7 +304,7 @@ eng_font_draw(void *data __UNUSED__, void *context, void *surface, void *font, i
|
|||
evas_common_soft16_font_glyph_new,
|
||||
evas_common_soft16_font_glyph_free,
|
||||
evas_common_soft16_font_glyph_draw);
|
||||
evas_common_font_draw(im, context, font, x, y, text_props);
|
||||
evas_common_font_draw(im, context, (RGBA_Font *) font, x, y, text_props);
|
||||
evas_common_draw_context_font_ext_set(context,
|
||||
NULL,
|
||||
NULL,
|
||||
|
|
|
@ -339,10 +339,12 @@ eng_image_cache_get(void *data __UNUSED__)
|
|||
}
|
||||
|
||||
static void
|
||||
eng_font_draw(void *data __UNUSED__, void *context, void *surface, void *font,
|
||||
int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *text_props)
|
||||
eng_font_draw(void *data __UNUSED__, void *context, void *surface,
|
||||
Evas_Font_Set *font, int x, int y, int w __UNUSED__, int h __UNUSED__,
|
||||
int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *text_props)
|
||||
{
|
||||
evas_common_font_draw(surface, context, font, x, y, text_props);
|
||||
evas_common_font_draw(surface, context, (RGBA_Font *) font, x, y,
|
||||
text_props);
|
||||
evas_common_draw_context_font_ext_set(context, NULL, NULL, NULL, NULL);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue