hmm - dont delete swallowed child objects... too much implicit stuff..
SVN revision: 10265
This commit is contained in:
parent
74c61becdf
commit
709fa0ba1f
|
@ -528,7 +528,8 @@ _edje_file_del(Edje *ed)
|
|||
evas_object_event_callback_del(rp->swallowed_object,
|
||||
EVAS_CALLBACK_FREE,
|
||||
_edje_object_part_swallow_free_cb);
|
||||
evas_object_del(rp->swallowed_object);
|
||||
/* I think it would be better swallowed objects dont get deleted */
|
||||
/* evas_object_del(rp->swallowed_object);*/
|
||||
}
|
||||
if (rp->text.text) free(rp->text.text);
|
||||
if (rp->text.font) free(rp->text.font);
|
||||
|
|
|
@ -41,8 +41,8 @@ _edje_add(Evas_Object *obj)
|
|||
ed->clipper = evas_object_rectangle_add(ed->evas);
|
||||
evas_object_smart_member_add(ed->clipper, obj);
|
||||
evas_object_color_set(ed->clipper, 255, 255, 255, 255);
|
||||
evas_object_move(ed->clipper, -1000000, -1000000);
|
||||
evas_object_resize(ed->clipper, 2000000, 2000000);
|
||||
evas_object_move(ed->clipper, -10000, -10000);
|
||||
evas_object_resize(ed->clipper, 20000, 20000);
|
||||
evas_object_pass_events_set(ed->clipper, 1);
|
||||
ed->have_objects = 1;
|
||||
ed->references = 1;
|
||||
|
|
|
@ -342,7 +342,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
|
|||
int psize;
|
||||
|
||||
psize = size;
|
||||
while ((tw > sw) && (size > 0))
|
||||
while ((tw > sw) && (size > 0) && (tw != 0))
|
||||
{
|
||||
psize = size;
|
||||
size = (size * sw) / tw;
|
||||
|
@ -357,7 +357,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
|
|||
int psize;
|
||||
|
||||
psize = size;
|
||||
while ((tw < sw) && (size > 0))
|
||||
while ((tw < sw) && (size > 0) && (tw != 0))
|
||||
{
|
||||
psize = size;
|
||||
size = (size * sw) / tw;
|
||||
|
|
Loading…
Reference in New Issue