Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_box.c e_dialog.c
Log Message:
fix box expand/fill
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_box.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_box.c 6 May 2005 06:22:13 -0000 1.8
+++ e_box.c 19 Sep 2005 12:55:59 -0000 1.9
@@ -465,10 +465,10 @@
ww = (w / (Evas_Coord)count);
hh = h;
ow = bi->min.w;
- if (bi->expand_w) ow = ww;
+ if (bi->fill_w) ow = ww;
if ((bi->max.w >= 0) && (bi->max.w < ow)) ow = bi->max.w;
oh = bi->min.h;
- if (bi->expand_h) oh = hh;
+ if (bi->fill_h) oh = hh;
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),
@@ -484,10 +484,10 @@
ww = bi->min.w;
hh = h;
ow = bi->min.w;
- if (bi->expand_w) ow = ww;
+ if (bi->fill_w) ow = ww;
if ((bi->max.w >= 0) && (bi->max.w < ow)) ow = bi->max.w;
oh = bi->min.h;
- if (bi->expand_h) oh = hh;
+ if (bi->fill_h) oh = hh;
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),
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_dialog.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_dialog.c 19 Sep 2005 10:52:45 -0000 1.9
+++ e_dialog.c 19 Sep 2005 12:55:59 -0000 1.10
@@ -106,7 +106,7 @@
e_box_pack_end(dia->box_object, db->obj);
e_box_pack_options_set(db->obj,
1, 1, /* fill */
- 1, 1, /* expand */
+ 0, 1, /* expand */
0.5, 0.5, /* align */
mw, mh, /* min */
9999, mh /* max */
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
