fix box expand/fill

SVN revision: 16767
This commit is contained in:
Carsten Haitzler 2005-09-19 12:55:59 +00:00
parent 4a39c9f5a1
commit f659f05b55
2 changed files with 5 additions and 5 deletions

View File

@ -465,10 +465,10 @@ _e_box_smart_reconfigure(E_Smart_Data *sd)
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 @@ _e_box_smart_reconfigure(E_Smart_Data *sd)
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),

View File

@ -106,7 +106,7 @@ e_dialog_button_add(E_Dialog *dia, char *label, char *icon, void (*func) (void *
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 */