From 8e521eb30372a55e537c3576e1072c76ef15dbe9 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Wed, 6 Feb 2008 02:14:04 +0000 Subject: [PATCH] Remove uselss if block. The same calculation was being done in both parts of the if. Fix some formatting issues. SVN revision: 33686 --- src/bin/e_box.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/src/bin/e_box.c b/src/bin/e_box.c index ab60a28c5..f610a86b9 100644 --- a/src/bin/e_box.c +++ b/src/bin/e_box.c @@ -485,10 +485,12 @@ _e_box_smart_reconfigure(E_Smart_Data *sd) hh = h; ow = bi->min.w; if (bi->fill_w) ow = ww; - if ((bi->max.w >= 0) && (bi->max.w < ow)) ow = bi->max.w; + if ((bi->max.w >= 0) && (bi->max.w < ow)) + ow = bi->max.w; oh = bi->min.h; if (bi->fill_h) oh = hh; - if ((bi->max.h >= 0) && (bi->max.h < oh)) oh = bi->max.h; + if ((bi->max.h >= 0) && (bi->max.h < oh)) + oh = bi->max.h; evas_object_move(obj, xx + (Evas_Coord)(((double)(ww - ow)) * bi->align.x), yy + (Evas_Coord)(((double)(hh - oh)) * bi->align.y)); @@ -595,26 +597,14 @@ _e_box_smart_extents_calculate(E_Smart_Data *sd) bi = evas_object_data_get(obj, "e_box_data"); if (bi) { - if (sd->horizontal) - { - if (minh < bi->min.h) minh = bi->min.h; - if (minw < bi->min.w) minw = bi->min.w; - } - else - { - if (minw < bi->min.w) minw = bi->min.w; - if (minh < bi->min.h) minh = bi->min.h; - } + if (minh < bi->min.h) minh = bi->min.h; + if (minw < bi->min.w) minw = bi->min.w; } } if (sd->horizontal) - { - minw *= evas_list_count(sd->items); - } + minw *= evas_list_count(sd->items); else - { - minh *= evas_list_count(sd->items); - } + minh *= evas_list_count(sd->items); } else {