From f659f05b55d50167a7d6c1636b34b5fa5662a945 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Mon, 19 Sep 2005 12:55:59 +0000 Subject: [PATCH] fix box expand/fill SVN revision: 16767 --- src/bin/e_box.c | 8 ++++---- src/bin/e_dialog.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bin/e_box.c b/src/bin/e_box.c index 1d7b55e79..97c354eb4 100644 --- a/src/bin/e_box.c +++ b/src/bin/e_box.c @@ -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), diff --git a/src/bin/e_dialog.c b/src/bin/e_dialog.c index 34e8fea1e..a642a288e 100644 --- a/src/bin/e_dialog.c +++ b/src/bin/e_dialog.c @@ -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 */