Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_box.c
Log Message:
Remove uselss if block. The same calculation was being done in both parts of
the if.
Fix some formatting issues.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_box.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_box.c 26 Jan 2008 05:28:46 -0000 1.23
+++ e_box.c 6 Feb 2008 02:14:04 -0000 1.24
@@ -485,10 +485,12 @@
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 @@
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
{
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
