clicking a toolbar item is now a toggle:

clicking an unselected item -> item is selected
	clicking a selected item -> item is unselected


SVN revision: 63333
This commit is contained in:
Mike Blumenkrantz 2011-09-12 02:05:30 +00:00
parent f73248e766
commit 550156cfdc
1 changed files with 15 additions and 9 deletions

View File

@ -136,23 +136,29 @@ _item_select(Elm_Toolbar_Item *it)
Elm_Toolbar_Item *it2;
Widget_Data *wd = elm_widget_data_get(it->base.widget);
Evas_Object *obj2;
Eina_Bool sel;
if (!wd) return;
if ((it->selected) || (it->disabled) || (it->separator)) return;
if ((it->disabled) || (it->separator)) return;
sel = it->selected;
if (!wd->no_select)
{
it2 = elm_toolbar_selected_item_get(it->base.widget);
_item_unselect(it2);
if (sel) _item_unselect(it);
else
{
it2 = elm_toolbar_selected_item_get(it->base.widget);
_item_unselect(it2);
it->selected = EINA_TRUE;
wd->selected_item = it;
edje_object_signal_emit(it->base.view, "elm,state,selected", "elm");
elm_widget_signal_emit(it->icon, "elm,state,selected", "elm");
_item_show(it);
it->selected = EINA_TRUE;
wd->selected_item = it;
edje_object_signal_emit(it->base.view, "elm,state,selected", "elm");
elm_widget_signal_emit(it->icon, "elm,state,selected", "elm");
_item_show(it);
}
}
obj2 = it->base.widget;
if (it->menu)
if (it->menu && (!sel))
{
evas_object_show(it->o_menu);
evas_object_event_callback_add(it->base.view, EVAS_CALLBACK_RESIZE,