enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

toolbar - be happy without icon 

SVN revision: 49767
This commit is contained in:
Carsten Haitzler 2010-06-20 10:55:08 +00:00
parent d0868ecd95
commit 401482dfbf
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/bin/e_widget_toolbar.c
View File

@ -158,7 +158,7 @@ e_widget_toolbar_item_remove(Evas_Object *obj, int num)
if (it) if (it)
{ {
evas_object_del(it->o_base); evas_object_del(it->o_base);
evas_object_del(it->o_icon); if (it->o_icon) evas_object_del(it->o_icon);
wd->items = eina_list_remove(wd->items, it); wd->items = eina_list_remove(wd->items, it);
E_FREE(it); E_FREE(it);
} }
@ -263,7 +263,7 @@ e_widget_toolbar_clear(Evas_Object *obj)
EINA_LIST_FREE(wd->items, it) EINA_LIST_FREE(wd->items, it)
{ {
evas_object_del(it->o_base); evas_object_del(it->o_base);
evas_object_del(it->o_icon); if (it->o_icon) evas_object_del(it->o_icon);
E_FREE(it); E_FREE(it);
} }
} }
@ -296,7 +296,7 @@ _e_wid_del_hook(Evas_Object *obj)
EINA_LIST_FREE(wd->items, it) EINA_LIST_FREE(wd->items, it)
{ {
evas_object_del(it->o_base); evas_object_del(it->o_base);
evas_object_del(it->o_icon); if (it->o_icon) evas_object_del(it->o_icon);
E_FREE(it); E_FREE(it);
} }
E_FREE(wd); E_FREE(wd);
@ -525,10 +525,13 @@ _item_select(Item *it)
{ {
it->selected = EINA_TRUE; it->selected = EINA_TRUE;
edje_object_signal_emit(it->o_base, "e,state,selected", "e"); edje_object_signal_emit(it->o_base, "e,state,selected", "e");
if (strcmp(evas_object_type_get(it->o_icon), "e_icon")) if (it->o_icon)
edje_object_signal_emit(it->o_icon, "e,state,selected", "e"); {
else if (strcmp(evas_object_type_get(it->o_icon), "e_icon"))
e_icon_selected_set(it->o_icon, EINA_TRUE); edje_object_signal_emit(it->o_icon, "e,state,selected", "e");
else
e_icon_selected_set(it->o_icon, EINA_TRUE);
}
_item_show(it); _item_show(it);
if (it->func) it->func((void *)it->data1, (void *)it->data2); if (it->func) it->func((void *)it->data1, (void *)it->data2);
} }
@ -538,8 +541,11 @@ _item_unselect(Item *it)
{ {
it->selected = EINA_FALSE; it->selected = EINA_FALSE;
edje_object_signal_emit(it->o_base, "e,state,unselected", "e"); edje_object_signal_emit(it->o_base, "e,state,unselected", "e");
if (strcmp(evas_object_type_get(it->o_icon), "e_icon")) if (it->o_icon)
edje_object_signal_emit(it->o_icon, "e,state,unselected", "e"); {
else if (strcmp(evas_object_type_get(it->o_icon), "e_icon"))
e_icon_selected_set(it->o_icon, EINA_FALSE); edje_object_signal_emit(it->o_icon, "e,state,unselected", "e");
else
e_icon_selected_set(it->o_icon, EINA_FALSE);
}
} }