summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2013-11-21 13:50:19 +0900
committerChunEon Park <hermet@hermet.pe.kr>2013-11-21 13:50:19 +0900
commiteea338764abcf38c8be404be7e3c540cfedc002b (patch)
treef410ba3ceb5e42adfe496608fee956bb3704ad04 /src/lib
parent12aba0db5a0949488d37b69b8696ed424666dca8 (diff)
edje - actually we don't need extra variable.
Diffstat (limited to '')
-rw-r--r--src/lib/edje/edje_calc.c7
-rw-r--r--src/lib/edje/edje_private.h1
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
3352 (statep1 >= ep->param1.state) || 3352 (statep1 >= ep->param1.state) ||
3353 proxy_invalidate || 3353 proxy_invalidate ||
3354 state || 3354 state ||
3355 (ep->map_on && ed->have_mapped_part) || 3355 (ed->have_mapped_part && chosen_desc->map.on) ||
3356 ((ep->part->type == EDJE_PART_TYPE_TEXT || 3356 ((ep->part->type == EDJE_PART_TYPE_TEXT ||
3357 ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) && 3357 ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) &&
3358 ed->text_part_change)) 3358 ed->text_part_change))
@@ -3421,7 +3421,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
3421 (statep2 >= ep->param2->state) || 3421 (statep2 >= ep->param2->state) ||
3422 proxy_invalidate || 3422 proxy_invalidate ||
3423 state || 3423 state ||
3424 (ep->map_on && ed->have_mapped_part) || 3424 (ed->have_mapped_part && chosen_desc->map.on) ||
3425 ((ep->part->type == EDJE_PART_TYPE_TEXT || 3425 ((ep->part->type == EDJE_PART_TYPE_TEXT ||
3426 ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) && 3426 ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) &&
3427 ed->text_part_change)) 3427 ed->text_part_change))
@@ -3895,7 +3895,6 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
3895 static Evas_Map *map = NULL; 3895 static Evas_Map *map = NULL;
3896 3896
3897 ed->have_mapped_part = EINA_TRUE; 3897 ed->have_mapped_part = EINA_TRUE;
3898 ep->map_on = EINA_TRUE;
3899 // create map and populate with part geometry 3898 // create map and populate with part geometry
3900 if (!map) map = evas_map_new(4); 3899 if (!map) map = evas_map_new(4);
3901 3900
@@ -3917,8 +3916,6 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
3917 } 3916 }
3918 else 3917 else
3919 { 3918 {
3920 ep->map_on = EINA_FALSE;
3921
3922 if (ep->nested_smart) 3919 if (ep->nested_smart)
3923 { /* Cancel map of smart obj holding nested parts */ 3920 { /* Cancel map of smart obj holding nested parts */
3924 eo_do(ep->nested_smart, 3921 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
1594#ifdef EDJE_CALC_CACHE 1594#ifdef EDJE_CALC_CACHE
1595 Eina_Bool invalidate : 1; // 0 1595 Eina_Bool invalidate : 1; // 0
1596#endif 1596#endif
1597 Eina_Bool map_on : 1; // 0
1598}; // 128 1597}; // 128
1599// WITH EDJE_CALC_CACHE: 407 1598// WITH EDJE_CALC_CACHE: 407
1600 1599