From 5a39de973b67baf4c0e4f32b5937bc4f58225ab6 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sun, 18 Sep 2005 06:01:35 +0000 Subject: [PATCH] fix min size calc SVN revision: 16745 --- legacy/edje/src/lib/edje_calc.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/legacy/edje/src/lib/edje_calc.c b/legacy/edje/src/lib/edje_calc.c index fec09f6c8e..7b2714cc9b 100644 --- a/legacy/edje/src/lib/edje_calc.c +++ b/legacy/edje/src/lib/edje_calc.c @@ -483,6 +483,7 @@ _edje_part_recalc_single(Edje *ed, { int mw = 0, mh = 0; + tw = th = 0; if (!chosen_desc->text.min_x) { evas_object_resize(ep->object, params->w, params->h); @@ -493,8 +494,14 @@ _edje_part_recalc_single(Edje *ed, evas_object_textblock2_style_insets_get(ep->object, &ins_l, &ins_r, &ins_t, &ins_b); mw = ins_l + tw + ins_r; mh = ins_t + th + ins_b; - if (mw > minw) minw = mw; - if (mh > minh) minh = mh; + if (chosen_desc->text.min_x) + { + if (mw > minw) minw = mw; + } + if (chosen_desc->text.min_y) + { + if (mh > minh) minh = mh; + } } } }