fix toolbar/toolbook sizing issue and also make toolbar emit signals

to say if icons are there or not.



SVN revision: 78559
devs/princeamd/enlightenment-0.17-elive
Carsten Haitzler 10 years ago
parent 70ed9168e2
commit 5458b95b24
  1. 11
      src/bin/e_widget_toolbar.c
  2. 1
      src/bin/e_widget_toolbook.c

@ -146,8 +146,15 @@ e_widget_toolbar_item_append(Evas_Object *obj, Evas_Object *icon, const char *la
edje_object_signal_callback_add(o, "e,action,click", "e",
_e_wid_signal_cb1, it);
edje_extern_object_min_size_set(icon, wd->icon_w, wd->icon_h);
edje_object_part_swallow(o, "e.swallow.icon", icon);
evas_object_show(icon);
if (icon)
{
edje_object_part_swallow(o, "e.swallow.icon", icon);
evas_object_show(icon);
edje_object_signal_emit(o, "e,icon,enabled", "e");
}
else
edje_object_signal_emit(o, "e,icon,disabled", "e");
edje_object_message_signal_process(o);
edje_object_part_text_set(o, "e.text.label", label);
edje_object_size_min_calc(o, &mw, &mh);
e_widget_sub_object_add(obj, o);

@ -46,6 +46,7 @@ e_widget_toolbook_page_append(Evas_Object *toolbook, Evas_Object *icon, const ch
wd = e_widget_data_get(toolbook);
e_widget_toolbar_item_append(wd->o_bar, icon, label, _item_sel,
toolbook, content);
e_widget_table_object_repack(wd->o_tb, wd->o_bar, 0, 0, 1, 1, 1, 1, 1, 0);
e_widget_table_object_align_append(wd->o_tb, content, 0, 1, 1, 1,
fill_w, fill_h, expand_w, expand_h,
ax, ay);

Loading…
Cancel
Save