From c21bfb49c20740f83b3f130fcd45c13fb73cdeda Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Thu, 17 May 2012 10:51:54 +0000 Subject: [PATCH] evas - removed unnecessary fields, changed_nomove and changed_move_only. These are actually not necessary right now. SVN revision: 71199 --- legacy/evas/src/lib/canvas/evas_object_main.c | 30 ++++++------------- legacy/evas/src/lib/include/evas_private.h | 2 -- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_main.c b/legacy/evas/src/lib/canvas/evas_object_main.c index b7de77bc9b..36dd494c02 100644 --- a/legacy/evas/src/lib/canvas/evas_object_main.c +++ b/legacy/evas/src/lib/canvas/evas_object_main.c @@ -34,8 +34,6 @@ void evas_object_change_reset(Evas_Object *obj) { obj->changed = EINA_FALSE; - obj->changed_move_only = EINA_FALSE; - obj->changed_nomove = EINA_FALSE; obj->changed_move = EINA_FALSE; obj->changed_map = EINA_FALSE; obj->changed_pchange = EINA_FALSE; @@ -83,30 +81,20 @@ evas_object_change(Evas_Object *obj) { Eina_List *l; Evas_Object *obj2; - Eina_Bool movch = 0; + Eina_Bool movch = EINA_FALSE; + + if (obj->layer->evas->nochange) return; + obj->layer->evas->changed = EINA_TRUE; - if (obj->layer->evas->nochange) - { -// printf("nochange %p\n", obj); - return; - } -// else -// printf("ch %p\n", obj); - obj->layer->evas->changed = 1; if (obj->changed_move) { - movch = 1; + movch = EINA_TRUE; obj->changed_move = EINA_FALSE; - if (!obj->changed_nomove) obj->changed_move_only = EINA_TRUE; - if (obj->changed) return; } - else - { - obj->changed_move_only = EINA_FALSE; - obj->changed_nomove = EINA_TRUE; - if (obj->changed) return; - } -// obj->changed = 1; + + if (obj->changed) return; + +// obj->changed = EINA_TRUE; evas_render_object_recalc(obj); /* set changed flag on all objects this one clips too */ if (!((movch) && (obj->is_static_clip))) diff --git a/legacy/evas/src/lib/include/evas_private.h b/legacy/evas/src/lib/include/evas_private.h index 8d9e7cbf6f..ef2f91c806 100644 --- a/legacy/evas/src/lib/include/evas_private.h +++ b/legacy/evas/src/lib/include/evas_private.h @@ -616,8 +616,6 @@ struct _Evas_Object Eina_Bool changed : 1; Eina_Bool changed_move : 1; - Eina_Bool changed_move_only : 1; - Eina_Bool changed_nomove : 1; Eina_Bool changed_map : 1; Eina_Bool changed_pchange : 1; Eina_Bool del_ref : 1;