enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

clip to swallower's clipper 

mih not 2 minw's


SVN revision: 7318
This commit is contained in:
Carsten Haitzler 2003-08-14 08:19:42 +00:00
parent 97e9f75ee1
commit 0e51283491
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/edje/src/lib/edje_calc.c
View File

@ -374,7 +374,7 @@ _edje_part_recalc_single(Edje *ed,
_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;
}

3
legacy/edje/src/lib/edje_util.c
View File

@ -279,7 +279,8 @@ edje_object_part_swallow(Evas_Object *obj, const char *part, Evas_Object *obj_sw
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);