summaryrefslogtreecommitdiff
path: root/src/bin/e_widget_toolbar.c
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-10-27 10:40:16 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-10-27 10:40:16 +0000
commit5458b95b2422de3cfce829ca596f17534def2170 (patch)
treeab32fe17f29026b0fa8c898a98cbcd85454af6b6 /src/bin/e_widget_toolbar.c
parent70ed9168e2a8caf58ebeea5ba49436e67940f895 (diff)
fix toolbar/toolbook sizing issue and also make toolbar emit signals
to say if icons are there or not. SVN revision: 78559
Diffstat (limited to 'src/bin/e_widget_toolbar.c')
-rw-r--r--src/bin/e_widget_toolbar.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/bin/e_widget_toolbar.c b/src/bin/e_widget_toolbar.c
index 14b0f2b..6fb78b1 100644
--- a/src/bin/e_widget_toolbar.c
+++ b/src/bin/e_widget_toolbar.c
@@ -146,8 +146,15 @@ e_widget_toolbar_item_append(Evas_Object *obj, Evas_Object *icon, const char *la
146 edje_object_signal_callback_add(o, "e,action,click", "e", 146 edje_object_signal_callback_add(o, "e,action,click", "e",
147 _e_wid_signal_cb1, it); 147 _e_wid_signal_cb1, it);
148 edje_extern_object_min_size_set(icon, wd->icon_w, wd->icon_h); 148 edje_extern_object_min_size_set(icon, wd->icon_w, wd->icon_h);
149 edje_object_part_swallow(o, "e.swallow.icon", icon); 149 if (icon)
150 evas_object_show(icon); 150 {
151 edje_object_part_swallow(o, "e.swallow.icon", icon);
152 evas_object_show(icon);
153 edje_object_signal_emit(o, "e,icon,enabled", "e");
154 }
155 else
156 edje_object_signal_emit(o, "e,icon,disabled", "e");
157 edje_object_message_signal_process(o);
151 edje_object_part_text_set(o, "e.text.label", label); 158 edje_object_part_text_set(o, "e.text.label", label);
152 edje_object_size_min_calc(o, &mw, &mh); 159 edje_object_size_min_calc(o, &mw, &mh);
153 e_widget_sub_object_add(obj, o); 160 e_widget_sub_object_add(obj, o);