hermet pushed a commit to branch master.
commit b98b7d5e042cc1f32d75bc006cb30f5c8a45c152
Author: ChunEon Park <[email protected]>
Date: Thu Jun 6 18:22:26 2013 +0900
edje - go away unnecesary code
---
src/lib/edje/edje_calc.c | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index ca4451d..ff06521 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -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;
--
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
