forked from enlightenment/efl
edje - actually we don't need extra variable.
This commit is contained in:
parent
12aba0db5a
commit
eea338764a
|
@ -3352,7 +3352,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
|
||||||
(statep1 >= ep->param1.state) ||
|
(statep1 >= ep->param1.state) ||
|
||||||
proxy_invalidate ||
|
proxy_invalidate ||
|
||||||
state ||
|
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_TEXT ||
|
||||||
ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) &&
|
ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) &&
|
||||||
ed->text_part_change))
|
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) ||
|
(statep2 >= ep->param2->state) ||
|
||||||
proxy_invalidate ||
|
proxy_invalidate ||
|
||||||
state ||
|
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_TEXT ||
|
||||||
ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) &&
|
ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) &&
|
||||||
ed->text_part_change))
|
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;
|
static Evas_Map *map = NULL;
|
||||||
|
|
||||||
ed->have_mapped_part = EINA_TRUE;
|
ed->have_mapped_part = EINA_TRUE;
|
||||||
ep->map_on = EINA_TRUE;
|
|
||||||
// create map and populate with part geometry
|
// create map and populate with part geometry
|
||||||
if (!map) map = evas_map_new(4);
|
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
|
else
|
||||||
{
|
{
|
||||||
ep->map_on = EINA_FALSE;
|
|
||||||
|
|
||||||
if (ep->nested_smart)
|
if (ep->nested_smart)
|
||||||
{ /* Cancel map of smart obj holding nested parts */
|
{ /* Cancel map of smart obj holding nested parts */
|
||||||
eo_do(ep->nested_smart,
|
eo_do(ep->nested_smart,
|
||||||
|
|
|
@ -1594,7 +1594,6 @@ struct _Edje_Real_Part
|
||||||
#ifdef EDJE_CALC_CACHE
|
#ifdef EDJE_CALC_CACHE
|
||||||
Eina_Bool invalidate : 1; // 0
|
Eina_Bool invalidate : 1; // 0
|
||||||
#endif
|
#endif
|
||||||
Eina_Bool map_on : 1; // 0
|
|
||||||
}; // 128
|
}; // 128
|
||||||
// WITH EDJE_CALC_CACHE: 407
|
// WITH EDJE_CALC_CACHE: 407
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue