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.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@73514 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index 8a3c414..4057166 100644 (file)
--- a/ChangeLog
+++ b/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/src/modules/engines/gl_x11/evas_engine.c b/src/modules/engines/gl_x11/evas_engine.c
index f0494e2..d227361 100644 (file)
--- a/src/modules/engines/gl_x11/evas_engine.c
+++ b/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,