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

elm test_map.c: Fixed infinite menu creation bug. Remove menu on map deletion. Patch by Bluezery <ohpowel@gmail.com> 

SVN revision: 78098
This commit is contained in:
Daniel Juyung Seo 2012-10-17 02:43:50 +00:00
parent f03c6ecb12
commit f1febd3afa
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
legacy/elementary/src/bin/test_map.c
View File

@ -836,20 +836,23 @@ _map_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event
{
down_x = down->canvas.x;
down_y = down->canvas.y;
menu = elm_menu_add(obj);
menu_it = elm_menu_item_add(menu, NULL, "", "Source", NULL, NULL);
_submenu_src_add(data, menu_it);
menu_it = elm_menu_item_add(menu, NULL, "", "Move", NULL, NULL);
_submenu_move_add(data, menu_it);
menu_it = elm_menu_item_add(menu, NULL, "", "Zoom", NULL, NULL);
_submenu_zoom_add(data, menu_it);
menu_it = elm_menu_item_add(menu, NULL, "", "Prop", NULL, NULL);
_submenu_prop_add(data, menu_it);
menu_it = elm_menu_item_add(menu, NULL, "", "Track", NULL, NULL);
_submenu_track_add(data, menu_it);
menu_it = elm_menu_item_add(menu, NULL, "", "Overlay", NULL, NULL);
_submenu_ovl_add(data, menu_it);
if (!menu)
{
menu = elm_menu_add(obj);
elm_menu_parent_set(menu, obj);
menu_it = elm_menu_item_add(menu, NULL, "", "Source", NULL, NULL);
_submenu_src_add(data, menu_it);
menu_it = elm_menu_item_add(menu, NULL, "", "Move", NULL, NULL);
_submenu_move_add(data, menu_it);
menu_it = elm_menu_item_add(menu, NULL, "", "Zoom", NULL, NULL);
_submenu_zoom_add(data, menu_it);
menu_it = elm_menu_item_add(menu, NULL, "", "Prop", NULL, NULL);
_submenu_prop_add(data, menu_it);
menu_it = elm_menu_item_add(menu, NULL, "", "Track", NULL, NULL);
_submenu_track_add(data, menu_it);
menu_it = elm_menu_item_add(menu, NULL, "", "Overlay", NULL, NULL);
_submenu_ovl_add(data, menu_it);
}
elm_menu_move(menu, down->canvas.x, down->canvas.y);
evas_object_show(menu);
}
@ -997,8 +1000,10 @@ _del_map(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
if (route) elm_map_route_del(route);
if (name) elm_map_name_del(name);
if (menu) evas_object_del(menu);
route = NULL;
name = NULL;
menu = NULL;
}
void