summaryrefslogtreecommitdiff
path: root/src/bin/e_widget_toolbar.c
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2010-02-05 12:24:42 +0000
committerCarsten Haitzler <raster@rasterman.com>2010-02-05 12:24:42 +0000
commita5c4d29cb9b28aafb6abf740c78200990f545185 (patch)
treed11c242d44b94d79f4e60dec907ae9ca11756e01 /src/bin/e_widget_toolbar.c
parent1814a74703875eb48be43337a9b0967d35eea32c (diff)
fix toolbar bug in sizing
SVN revision: 45896
Diffstat (limited to 'src/bin/e_widget_toolbar.c')
-rw-r--r--src/bin/e_widget_toolbar.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/bin/e_widget_toolbar.c b/src/bin/e_widget_toolbar.c
index 34e57be..4a0be73 100644
--- a/src/bin/e_widget_toolbar.c
+++ b/src/bin/e_widget_toolbar.c
@@ -7,7 +7,7 @@ typedef struct _E_Widget_Data E_Widget_Data;
7typedef struct _Item Item; 7typedef struct _Item Item;
8struct _E_Widget_Data 8struct _E_Widget_Data
9{ 9{
10 Evas_Object *o_base, *o_box, *o_scrollframe0; 10 Evas_Object *o_base, *o_box;
11 int icon_w, icon_h; 11 int icon_w, icon_h;
12 Eina_List *items; 12 Eina_List *items;
13 Eina_Bool scrollable : 1; 13 Eina_Bool scrollable : 1;
@@ -128,7 +128,6 @@ e_widget_toolbar_item_append(Evas_Object *obj, Evas_Object *icon, const char *la
128 edje_object_size_min_calc(o, &mw, &mh); 128 edje_object_size_min_calc(o, &mw, &mh);
129 e_widget_sub_object_add(obj, o); 129 e_widget_sub_object_add(obj, o);
130 e_box_pack_end(wd->o_box, o); 130 e_box_pack_end(wd->o_box, o);
131 evas_object_show(o);
132 e_box_pack_options_set(o, 131 e_box_pack_options_set(o,
133 1, 1, /* fill */ 132 1, 1, /* fill */
134 0, 0, /* expand */ 133 0, 0, /* expand */
@@ -136,6 +135,7 @@ e_widget_toolbar_item_append(Evas_Object *obj, Evas_Object *icon, const char *la
136 mw, mh, /* min */ 135 mw, mh, /* min */
137 9999, 9999 /* max */ 136 9999, 9999 /* max */
138 ); 137 );
138 evas_object_show(o);
139 e_box_size_min_get(wd->o_box, &mw, &mh); 139 e_box_size_min_get(wd->o_box, &mw, &mh);
140 evas_object_resize(wd->o_box, mw, mh); 140 evas_object_resize(wd->o_box, mw, mh);
141 evas_object_resize(wd->o_base, 500, 500); 141 evas_object_resize(wd->o_base, 500, 500);
@@ -144,6 +144,7 @@ e_widget_toolbar_item_append(Evas_Object *obj, Evas_Object *icon, const char *la
144 e_widget_size_min_set(obj, 500 - vw, mh + (500 - vh)); 144 e_widget_size_min_set(obj, 500 - vw, mh + (500 - vh));
145 else 145 else
146 e_widget_size_min_set(obj, mw + (500 - vw), mh + (500 - vh)); 146 e_widget_size_min_set(obj, mw + (500 - vw), mh + (500 - vh));
147 evas_object_resize(wd->o_box, mw, mh);
147} 148}
148 149
149EAPI void 150EAPI void
@@ -226,6 +227,7 @@ e_widget_toolbar_scrollable_set(Evas_Object *obj, Eina_Bool scrollable)
226 e_widget_size_min_set(obj, 500 - vw, mh + (500 - vh)); 227 e_widget_size_min_set(obj, 500 - vw, mh + (500 - vh));
227 else 228 else
228 e_widget_size_min_set(obj, mw + (500 - vw), mh + (500 - vh)); 229 e_widget_size_min_set(obj, mw + (500 - vw), mh + (500 - vh));
230 evas_object_resize(wd->o_box, mw, mh);
229} 231}
230 232
231EAPI void 233EAPI void