From eea338764abcf38c8be404be7e3c540cfedc002b Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Thu, 21 Nov 2013 13:50:19 +0900 Subject: [PATCH] edje - actually we don't need extra variable. --- src/lib/edje/edje_calc.c | 7 ++----- src/lib/edje/edje_private.h | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index 6f98455c78..038882dbf7 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c @@ -3352,7 +3352,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta (statep1 >= ep->param1.state) || proxy_invalidate || state || - (ep->map_on && ed->have_mapped_part) || + (ed->have_mapped_part && chosen_desc->map.on) || ((ep->part->type == EDJE_PART_TYPE_TEXT || ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) && ed->text_part_change)) @@ -3421,7 +3421,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta (statep2 >= ep->param2->state) || proxy_invalidate || state || - (ep->map_on && ed->have_mapped_part) || + (ed->have_mapped_part && chosen_desc->map.on) || ((ep->part->type == EDJE_PART_TYPE_TEXT || ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) && ed->text_part_change)) @@ -3895,7 +3895,6 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta static Evas_Map *map = NULL; ed->have_mapped_part = EINA_TRUE; - ep->map_on = EINA_TRUE; // create map and populate with part geometry if (!map) map = evas_map_new(4); @@ -3917,8 +3916,6 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta } else { - ep->map_on = EINA_FALSE; - if (ep->nested_smart) { /* Cancel map of smart obj holding nested parts */ eo_do(ep->nested_smart, diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h index bfcc9b761e..b6e0db909b 100644 --- a/src/lib/edje/edje_private.h +++ b/src/lib/edje/edje_private.h @@ -1594,7 +1594,6 @@ struct _Edje_Real_Part #ifdef EDJE_CALC_CACHE Eina_Bool invalidate : 1; // 0 #endif - Eina_Bool map_on : 1; // 0 }; // 128 // WITH EDJE_CALC_CACHE: 407