From f0276f66af5bdd430cced12edfb8f464a02426b6 Mon Sep 17 00:00:00 2001 From: tasn Date: Sun, 30 Jan 2011 10:41:23 +0000 Subject: [PATCH] Evas textblock: The only thing that should force a 'native recalc' is a change in the text. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@56501 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/canvas/evas_object_textblock.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c index 5216e31..4628941 100644 --- a/src/lib/canvas/evas_object_textblock.c +++ b/src/lib/canvas/evas_object_textblock.c @@ -3307,8 +3307,6 @@ _relayout(const Evas_Object *obj) o = (Evas_Object_Textblock *)(obj->object_data); paragraphs = o->paragraphs; o->paragraphs = NULL; - o->formatted.valid = 0; - o->native.valid = 0; _layout(obj, 0, obj->cur.geometry.w, obj->cur.geometry.h, @@ -5966,7 +5964,6 @@ static void _evas_textblock_changed(Evas_Object_Textblock *o, Evas_Object *obj) { o->formatted.valid = 0; - o->native.valid = 0; o->changed = 1; evas_object_change(obj); @@ -8171,7 +8168,6 @@ evas_object_textblock_render_pre(Evas_Object *obj) paragraphs = o->paragraphs; o->paragraphs = NULL; o->formatted.valid = 0; - o->native.valid = 0; _layout(obj, 0, obj->cur.geometry.w, obj->cur.geometry.h, @@ -8331,7 +8327,6 @@ evas_object_textblock_coords_recalc(Evas_Object *obj) if (obj->cur.geometry.w != o->last_w) { o->formatted.valid = 0; - o->native.valid = 0; o->changed = 1; } } @@ -8374,10 +8369,7 @@ _evas_object_textblock_rehint(Evas_Object *obj) } } } - o->formatted.valid = 0; - o->native.valid = 0; - o->changed = 1; - evas_object_change(obj); + _evas_textblock_text_node_changed(o, obj, NULL); } /** -- 2.7.4