forked from enlightenment/efl
clip to swallower's clipper
mih not 2 minw's SVN revision: 7318
This commit is contained in:
parent
97e9f75ee1
commit
0e51283491
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue