From: <enl...@li...> - 2003-08-14 08:23:45
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/edje Dir : e17/libs/edje/src/lib Modified Files: edje_calc.c edje_util.c Log Message: clip to swallower's clipper mih not 2 minw's =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_calc.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- edje_calc.c 14 Aug 2003 03:22:37 -0000 1.11 +++ edje_calc.c 14 Aug 2003 08:19:42 -0000 1.12 @@ -374,7 +374,7 @@ _edje_text_styles[ep->part->effect].pad.l + _edje_text_styles[ep->part->effect].pad.r; if (chosen_desc->text.min_y) - minw = th + + minh = th + _edje_text_styles[ep->part->effect].pad.t + _edje_text_styles[ep->part->effect].pad.b; } =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_util.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- edje_util.c 5 Aug 2003 14:33:35 -0000 1.17 +++ edje_util.c 14 Aug 2003 08:19:42 -0000 1.18 @@ -279,7 +279,8 @@ if (!obj_swallow) return; rp->swallowed_object = obj_swallow; evas_object_smart_member_add(rp->swallowed_object, ed->obj); - evas_object_clip_set(rp->swallowed_object, ed->clipper); + if (rp->clip_to) evas_object_clip_set(rp->object, rp->clip_to->object); + else evas_object_clip_set(rp->swallowed_object, ed->clipper); if (evas_object_layer_get(rp->swallowed_object) != ed->layer) evas_object_layer_set(rp->swallowed_object, ed->layer); evas_object_stack_above(rp->swallowed_object, rp->object); |