From b7ff5a737f3861fa63fd496c455d3e49a8fe2788 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Tue, 28 May 2013 23:07:24 +0900 Subject: [PATCH] evas/textblock - fix the textblock to render pre again if it needs to be relayouting --- ChangeLog | 4 ++++ NEWS | 1 + src/lib/evas/canvas/evas_object_textblock.c | 8 +++++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 113c1b75a9..a0a261aedb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-05-28 ChunEon Park (Hermet) + + * Fix textblock to render pre again if it needs to relayouting. + 2013-05-27 Jihoon Kim (jihoon) * Add ECORE_IMF_INPUT_PANEL_LAYOUT_DATETIME layout diff --git a/NEWS b/NEWS index 29ba2369df..be606168f3 100644 --- a/NEWS +++ b/NEWS @@ -283,3 +283,4 @@ Fixes: ecore_con_client_uptime_get() is working. * Fix srv->start_time (initialization missing). So now ecore_con_server_uptime_get() is working for plain TCP connections. + * Fix textblock to render pre again if it needs to relayouting. diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index b6b01352aa..3e81d9eb3c 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -10805,9 +10805,6 @@ evas_object_textblock_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data Evas_Object_Textblock *o = eo_data_scope_get(eo_obj, MY_CLASS); int is_v, was_v; - /* dont pre-render the obj twice! */ - if (obj->pre_render_done) return; - obj->pre_render_done = EINA_TRUE; /* pre-render phase. this does anything an object needs to do just before */ /* rendering. this could mean loading the image data, retrieving it from */ /* elsewhere, decoding video etc. */ @@ -10826,6 +10823,11 @@ evas_object_textblock_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data was_v = evas_object_was_visible(eo_obj, obj); goto done; } + + /* dont pre-render the obj twice! */ + if (obj->pre_render_done) return; + obj->pre_render_done = EINA_TRUE; + if (o->redraw) { o->redraw = 0;