From 595957895405d1753d9bd96f9cbce34bfeadf5d5 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Fri, 10 Jul 2009 23:13:09 +0000 Subject: [PATCH] fix minor glitches with edje box. still missing: * box.max * proper handling of min/max, need to behave like text. SVN revision: 41297 --- legacy/edje/src/lib/edje_calc.c | 4 ++-- legacy/edje/src/lib/edje_util.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/legacy/edje/src/lib/edje_calc.c b/legacy/edje/src/lib/edje_calc.c index 342d51a9a3..41291a8fa7 100644 --- a/legacy/edje/src/lib/edje_calc.c +++ b/legacy/edje/src/lib/edje_calc.c @@ -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; } diff --git a/legacy/edje/src/lib/edje_util.c b/legacy/edje/src/lib/edje_util.c index d2f979137f..d5fdf31e4a 100644 --- a/legacy/edje/src/lib/edje_util.c +++ b/legacy/edje/src/lib/edje_util.c @@ -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)