rggammon
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

edje - go away unnecesary code

This commit is contained in:
ChunEon Park 2013-06-06 18:22:26 +09:00
parent 8476e20ffe
commit b98b7d5e04
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib/edje/edje_calc.c
View File

@ -3659,21 +3659,12 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
(ep->typedata.swallow)) &&
(ep->typedata.swallow->swallowed_object))
{
//// the below really is wrong - swallow color shouldn't affect swallowed object
//// color - the edje color as a WHOLE should though - and that should be
//// done via the clipper anyway. this created bugs when objects had their
//// colro set and were swallowed - then had their color changed.
// evas_object_color_set(ep->typedata.swallow->swallowed_object,
// (pf->color.r * pf->color.a) / 255,
// (pf->color.g * pf->color.a) / 255,
// (pf->color.b * pf->color.a) / 255,
// pf->color.a);
if (pf->visible)
{
eo_do(ep->typedata.swallow->swallowed_object,
evas_obj_position_set(ed->x + pf->x, ed->y + pf->y),
evas_obj_size_set(pf->w, pf->h),
evas_obj_visibility_set(EINA_TRUE));
eo_do(ep->typedata.swallow->swallowed_object,
evas_obj_position_set(ed->x + pf->x, ed->y + pf->y),
evas_obj_size_set(pf->w, pf->h),
evas_obj_visibility_set(EINA_TRUE));
}
else evas_object_hide(ep->typedata.swallow->swallowed_object);
mo = ep->typedata.swallow->swallowed_object;