enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

elemenatry/toolbar - 

removed BASE macro to disable the item.
but use the elm_widget_item_disabled_get instead. 




SVN revision: 66033
This commit is contained in:
ChunEon Park 2011-12-08 13:53:38 +00:00
parent c45ce564dc
commit abab649687
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
legacy/elementary/src/lib/elm_toolbar.c
View File

@ -4,10 +4,6 @@
#include "els_box.h"
#include "els_icon.h"
/* FIXME: I couldn't find a macro for it, this should be fixed.
* Just doing this commit to fix the brokeness that was introduced. */
#define BASE(it) (&(it)->base)
typedef struct _Widget_Data Widget_Data;
typedef struct _Elm_Toolbar_Item Elm_Toolbar_Item;
@ -153,7 +149,7 @@ _item_select(Elm_Toolbar_Item *it)
Eina_Bool sel;
if (!wd) return;
if ((BASE(it)->disabled) || (it->separator)) return;
if (elm_widget_item_disabled_get(it) || (it->separator)) return;
sel = it->selected;
if (!wd->no_select)
@ -226,9 +222,9 @@ _item_disable(Elm_Toolbar_Item *it, Eina_Bool disabled)
Widget_Data *wd = elm_widget_data_get(WIDGET(it));
if (!wd) return;
if (BASE(it)->disabled == disabled) return;
BASE(it)->disabled = !!disabled;
if (BASE(it)->disabled)
if (elm_widget_item_disabled_get(it) == disabled) return;
elm_object_item_disabled_set((Elm_Object_Item *) it, disabled);
if (disabled)
{
edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm");
elm_widget_signal_emit(it->icon, "elm,state,disabled", "elm");
@ -320,7 +316,7 @@ _theme_hook_item(Evas_Object *obj, Elm_Toolbar_Item *it, double scale, int icon_
edje_object_signal_emit(view, "elm,state,selected", "elm");
elm_widget_signal_emit(it->icon, "elm,state,selected", "elm");
}
if (BASE(it)->disabled)
if (elm_widget_item_disabled_get(it))
{
edje_object_signal_emit(view, "elm,state,disabled", "elm");
elm_widget_signal_emit(it->icon, "elm,state,disabled", "elm");
@ -543,7 +539,8 @@ _resize_job(void *data)
menu_it = elm_menu_item_add(menu, NULL,
it->icon_str, it->label,
_elm_toolbar_item_menu_cb, it);
elm_object_item_disabled_set(menu_it, BASE(it)->disabled);
elm_object_item_disabled_set(menu_it,
elm_widget_item_disabled_get(it));
if (it->o_menu)
elm_menu_clone(it->o_menu, menu, menu_it);
}
@ -735,7 +732,7 @@ _access_state_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, Elm_Widget_
Elm_Toolbar_Item *it = (Elm_Toolbar_Item *)item;
if (it->separator)
return strdup(E_("Separator"));
else if (BASE(it)->disabled)
else if (elm_widget_item_disabled_get(it))
return strdup(E_("State: Disabled"));
else if (it->selected)
return strdup(E_("State: Selected"));
@ -1766,7 +1763,7 @@ elm_toolbar_item_state_set(Elm_Object_Item *it, Elm_Toolbar_Item_State *state)
wd->icon_size,
"elm,state,icon_set,backward");
}
if (BASE(item)->disabled)
if (elm_widget_item_disabled_get(item))
elm_widget_signal_emit(item->icon, "elm,state,disabled", "elm");
else
elm_widget_signal_emit(item->icon, "elm,state,enabled", "elm");