From 23203c9e727dd35c9c529b8a58ac600eb41dd114 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Mon, 10 Jul 2017 16:22:32 +0200 Subject: [PATCH] elementary: fix leaking manager objects they are now automatically destroyed once the object is deleted. --- src/lib/elementary/efl_ui_win.c | 2 +- src/lib/elementary/elm_hover.c | 2 +- src/lib/elementary/elm_inwin.c | 2 +- src/lib/elementary/elm_menu.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 4d32bbf3a0..90bdb2c145 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -5331,7 +5331,7 @@ _efl_ui_win_elm_widget_focus_manager_factory(Eo *obj EINA_UNUSED, Efl_Ui_Win_Dat { Efl_Ui_Focus_Manager *manager; - manager = efl_add(EFL_UI_FOCUS_MANAGER_CLASS, NULL, + manager = efl_add(EFL_UI_FOCUS_MANAGER_CLASS, obj, efl_ui_focus_manager_root_set(efl_added, root) ); diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c index 2af45db230..defe5d5430 100644 --- a/src/lib/elementary/elm_hover.c +++ b/src/lib/elementary/elm_hover.c @@ -691,7 +691,7 @@ _elm_hover_elm_widget_focus_manager_factory(Eo *obj EINA_UNUSED, Elm_Hover_Data { Efl_Ui_Focus_Manager *manager; - manager = efl_add(EFL_UI_FOCUS_MANAGER_CLASS, NULL, + manager = efl_add(EFL_UI_FOCUS_MANAGER_CLASS, obj, efl_ui_focus_manager_root_set(efl_added, root) ); diff --git a/src/lib/elementary/elm_inwin.c b/src/lib/elementary/elm_inwin.c index 174e471c91..c60166b01b 100644 --- a/src/lib/elementary/elm_inwin.c +++ b/src/lib/elementary/elm_inwin.c @@ -113,7 +113,7 @@ _elm_inwin_elm_widget_focus_manager_factory(Eo *obj EINA_UNUSED, Elm_Inwin_Data { Efl_Ui_Focus_Manager *manager; - manager = efl_add(EFL_UI_FOCUS_MANAGER_ROOT_FOCUS_CLASS, NULL, + manager = efl_add(EFL_UI_FOCUS_MANAGER_ROOT_FOCUS_CLASS, obj, efl_ui_focus_manager_root_set(efl_added, root) ); diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c index 4d4895acd5..8f8bf96e64 100644 --- a/src/lib/elementary/elm_menu.c +++ b/src/lib/elementary/elm_menu.c @@ -135,7 +135,7 @@ _submenu_sizing_eval(Elm_Menu_Item_Data *parent_it) evas_object_geometry_get(VIEW(parent_it), &x2, &y2, &w2, &h2); evas_object_geometry_get(parent_it->submenu.bx, &bx, &by, &bw, &bh); _parent_geometry_get(sd, &px, &py, &pw, &ph); - + if (sd->menu_bar && !parent_it->parent) { x_p = x2; @@ -806,7 +806,7 @@ _elm_menu_elm_widget_focus_manager_factory(Eo *obj EINA_UNUSED, Elm_Menu_Data *p { Efl_Ui_Focus_Manager *manager; - manager = efl_add(EFL_UI_FOCUS_MANAGER_CLASS, NULL, + manager = efl_add(EFL_UI_FOCUS_MANAGER_CLASS, obj, efl_ui_focus_manager_root_set(efl_added, root) );