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

Fix more formatting, *sigh* 

Use ELM_NEW instead of calloc directly



SVN revision: 43155
This commit is contained in:
Christopher Michael 2009-10-18 17:20:18 +00:00
parent 2b6e62ee2c
commit 77ed1224ab
1 changed files with 65 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,8 +83,10 @@ _item_select(Elm_Toolbar_Item *it)
if(it->menu)
{
evas_object_show(it->o_menu);
evas_object_event_callback_add(it->base, EVAS_CALLBACK_RESIZE, _menu_move_resize, it);
evas_object_event_callback_add(it->base, EVAS_CALLBACK_MOVE, _menu_move_resize, it);
evas_object_event_callback_add(it->base, EVAS_CALLBACK_RESIZE,
_menu_move_resize, it);
evas_object_event_callback_add(it->base, EVAS_CALLBACK_MOVE,
_menu_move_resize, it);
_menu_move_resize(it, NULL, NULL, NULL);
}
@ -103,10 +105,10 @@ static void
_menu_move_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Elm_Toolbar_Item *it = data;
Evas_Coord x_p,y_p,x,y,w,h,x2,y2,w2,h2,bx,by,bw,bh;
Evas_Coord x, y, w, h;
Widget_Data *wd = elm_widget_data_get(it->obj);
if (!wd || !wd->menu_parent) return;
if ((!wd) || (!wd->menu_parent)) return;
evas_object_geometry_get(it->base, &x, &y, &w, &h);
elm_menu_move(it->o_menu, x, y + h);
}
@ -133,10 +135,8 @@ _del_pre_hook(Evas_Object *obj)
if (!wd) return;
EINA_LIST_FREE(wd->items, it)
{
elm_toolbar_item_menu_set(it, 0);
}
}
static void
_del_hook(Evas_Object *obj)
@ -193,9 +193,8 @@ _theme_hook(Evas_Object *obj)
edje_object_part_text_set(it->base, "elm.text", it->label);
}
else
{
_elm_theme_set(it->base, "toolbar", "separator", style);
}
mw = mh = -1;
if (!it->separator)
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
@ -356,7 +355,7 @@ elm_toolbar_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, voi
Elm_Toolbar_Item *it;
if (!wd) return NULL;
it = calloc(1, sizeof(Elm_Toolbar_Item));
it = ELM_NEW(Elm_Toolbar_Item);
if (!it) return NULL;
wd->items = eina_list_append(wd->items, it);
it->obj = obj;
@ -497,11 +496,9 @@ elm_toolbar_menu_parent_set(Evas_Object *obj, Evas_Object *parent)
{
Eina_List *l;
Elm_Toolbar_Item *it;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
if(!parent) return;
if ((!wd) || (!parent)) return;
wd->menu_parent = parent;
EINA_LIST_FOREACH(wd->items, l, it)
{
@ -516,6 +513,7 @@ elm_toolbar_item_unselect_all(Evas_Object *obj)
Eina_List *l;
Elm_Toolbar_Item *it;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
EINA_LIST_FOREACH(wd->items, l, it)
{
@ -540,34 +538,34 @@ elm_toolbar_align_set(Evas_Object *obj, double align)
Eina_List *l;
Elm_Toolbar_Item *it;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
if (!wd) return;
if(wd->align != align)
evas_object_size_hint_align_set(wd->bx, align, 0.5);
wd->align = align;
}
EAPI void
elm_toolbar_item_menu_set(Elm_Toolbar_Item *item, Eina_Bool menu)
{
if (!item) return;
Widget_Data *wd = elm_widget_data_get(item->obj);
if ((!wd) || (!item)) return;
if (item->menu == menu) return;
item->menu = menu;
Widget_Data *wd = elm_widget_data_get(item->obj);
if (!wd) return;
if(menu)
{
item->o_menu = elm_menu_add(item->base);
if (wd->menu_parent)
elm_menu_parent_set(item->o_menu, wd->menu_parent);
evas_object_event_callback_add(item->o_menu, EVAS_CALLBACK_HIDE, _menu_hide, item);
evas_object_event_callback_add(item->o_menu, EVAS_CALLBACK_HIDE,
_menu_hide, item);
}
else if (item->o_menu)
{
evas_object_event_callback_del(item->o_menu, EVAS_CALLBACK_HIDE, _menu_hide);
evas_object_event_callback_del(item->o_menu, EVAS_CALLBACK_HIDE,
_menu_hide);
evas_object_del(item->o_menu);
}
}
@ -581,4 +579,3 @@ elm_toolbar_item_menu_get(Elm_Toolbar_Item *item)
elm_toolbar_item_menu_set(item, 1);
return item->o_menu;
}