From 7674239482d4c98ba3811d168263edb6b5d18c9b Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Tue, 10 Jul 2012 05:56:13 +0000 Subject: [PATCH] evas/text - Let Draw Text with it's viewport size instead of window size. When map is enabled then text should be rendered completely for it's surface. SVN revision: 73514 --- legacy/evas/ChangeLog | 4 ++++ legacy/evas/src/modules/engines/gl_x11/evas_engine.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/legacy/evas/ChangeLog b/legacy/evas/ChangeLog index 8a3c41449a..4057166a86 100644 --- a/legacy/evas/ChangeLog +++ b/legacy/evas/ChangeLog @@ -873,3 +873,7 @@ * Don't let bad map sneek at render time and ban them as early as possible. +2012-07-07 ChunEon Park(Hermet) + + * Let Draw Text with viewport size instead of window size. When map is enabled then it should be rendered completely. + diff --git a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c index f0494e28be..d22736134a 100644 --- a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c +++ b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c @@ -2711,7 +2711,6 @@ static void eng_image_draw(void *data, void *context, void *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth) { Render_Engine *re; - re = (Render_Engine *)data; if (!image) return; @@ -2889,14 +2888,15 @@ eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font __UN if (!im) im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get()); - im->cache_entry.w = re->win->w; - im->cache_entry.h = re->win->h; + im->cache_entry.w = re->win->gl_context->shared->w; + im->cache_entry.h = re->win->gl_context->shared->h; + evas_common_draw_context_font_ext_set(context, re->win->gl_context, evas_gl_font_texture_new, evas_gl_font_texture_free, evas_gl_font_texture_draw); - evas_common_font_draw_prepare(intl_props); + evas_common_font_draw_prepare(intl_props); evas_common_font_draw(im, context, x, y, intl_props); evas_common_draw_context_font_ext_set(context, NULL,