enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 13 Pull Requests 2 Projects Releases Wiki Activity

Elb menu: Fix bug. add the callback in the end else they can be called before all data are ready. 

SVN revision: 43364
This commit is contained in:
Jonathan Atton 2009-10-31 09:27:22 +00:00
parent 13d77f2c4b
commit 359474bcec
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/elementary/data/themes/default.edc
View File

@ -15738,7 +15738,7 @@ collections {
}
}
}
group { name: "elm/pager/base/fade_translucide";
group { name: "elm/pager/base/fade_translucide";
data.item: "onshow" "raise";
// other options
// data.item: "onhide" "lower";

2
legacy/elementary/src/lib/elm_frame.c
View File

@ -26,7 +26,7 @@ static void
_del_hook(Evas_Object *obj)
{
Widget_Data *wd = elm_widget_data_get(obj);
elm_frame_content_set(obj, NULL);
free(wd);
}

6
legacy/elementary/src/lib/elm_menu.c
View File

@ -407,7 +407,6 @@ _item_submenu_obj_create(Elm_Menu_Item *item)
elm_object_style_set(item->hv, "submenu");
item->bx = elm_box_add(wd->bx);
evas_object_event_callback_add(item->bx, EVAS_CALLBACK_RESIZE, _menu_resize, item->menu);
evas_object_size_hint_weight_set(item->bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_show(item->bx);
elm_hover_content_set(item->hv, elm_hover_best_content_location_get(item->hv, ELM_HOVER_AXIS_VERTICAL), item->bx);
@ -420,6 +419,8 @@ _item_submenu_obj_create(Elm_Menu_Item *item)
_submenu_open, item);
evas_object_event_callback_add(item->o, EVAS_CALLBACK_MOVE, _item_move_resize, item);
evas_object_event_callback_add(item->o, EVAS_CALLBACK_RESIZE, _item_move_resize, item);
evas_object_event_callback_add(item->bx, EVAS_CALLBACK_RESIZE, _menu_resize, item->menu);
}
@ -458,7 +459,6 @@ elm_menu_add(Evas_Object *parent)
evas_object_smart_callback_add(wd->hv, "clicked", _hover_clicked_cb, obj);
wd->bx = elm_box_add(obj);
evas_object_event_callback_add(wd->bx, EVAS_CALLBACK_RESIZE, _menu_resize, obj);
evas_object_size_hint_weight_set(wd->bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_show(wd->bx);
elm_hover_content_set(wd->hv, elm_hover_best_content_location_get(wd->hv, ELM_HOVER_AXIS_VERTICAL), wd->bx);
@ -467,6 +467,8 @@ elm_menu_add(Evas_Object *parent)
evas_object_event_callback_add(obj, EVAS_CALLBACK_SHOW, _show, obj);
evas_object_event_callback_add(wd->bx, EVAS_CALLBACK_RESIZE, _menu_resize, obj);
_sizing_eval(obj);
return obj;
}