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

fix minor glitches with edje box. 

still missing:
  * box.max
  * proper handling of min/max, need to behave like text.



SVN revision: 41297
This commit is contained in:
Gustavo Sverzut Barbieri 2009-07-10 23:13:09 +00:00
parent d6a6cc63e8
commit 5959578954
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1242,9 +1242,9 @@ _edje_box_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edje_
evas_object_smart_calculate(ep->object);
}
evas_object_size_hint_min_get(ep->object, &min_w, &min_h);
if (chosen_desc->box.min.h)
if (chosen_desc->box.min.h && (p3->w < min_w))
p3->w = min_w;
if (chosen_desc->box.min.v)
if (chosen_desc->box.min.v && (p3->h < min_w))
p3->h = min_h;
}

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

@ -2732,11 +2732,11 @@ _edje_real_part_box_remove_all(Edje_Real_Part *rp, Eina_Bool clear)
while (children)
{
Evas_Object *child_obj = children->data;
_edje_box_child_remove(rp, child_obj);
if (evas_object_data_get(child_obj, "\377 edje.box_item"))
i++;
else
{
_edje_box_child_remove(rp, child_obj);
if (!evas_object_box_remove_at(rp->object, i))
return EINA_FALSE;
if (clear)