bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=baf624680d12cfd7556b2abb9d8199df5c47d216
commit baf624680d12cfd7556b2abb9d8199df5c47d216 Author: Marcel Hollerbach <[email protected]> Date: Sun Dec 3 13:26:16 2017 +0100 efl_ui_focus_manager: fix api duplication --- src/lib/elementary/efl_ui_focus_manager.eo | 2 +- src/lib/elementary/efl_ui_focus_manager_calc.c | 4 ++-- src/lib/elementary/efl_ui_focus_manager_calc.eo | 2 +- src/lib/elementary/efl_ui_focus_manager_root_focus.c | 4 ++-- src/lib/elementary/efl_ui_focus_manager_root_focus.eo | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/elementary/efl_ui_focus_manager.eo b/src/lib/elementary/efl_ui_focus_manager.eo index 85e87b2a64..3d26ab20fc 100644 --- a/src/lib/elementary/efl_ui_focus_manager.eo +++ b/src/lib/elementary/efl_ui_focus_manager.eo @@ -57,7 +57,7 @@ interface Efl.Ui.Focus.Manager { } return : Efl.Ui.Focus.Object; [[Next object to focus]] } - @property focus { + @property manager_focus { [[The element which is currently focused by this manager For the case focus is a logical child, then the item will go to the next none logical element. If there is none, focus will stay where it is right now. diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c b/src/lib/elementary/efl_ui_focus_manager_calc.c index e48cf262e5..508626aafc 100644 --- a/src/lib/elementary/efl_ui_focus_manager_calc.c +++ b/src/lib/elementary/efl_ui_focus_manager_calc.c @@ -1353,7 +1353,7 @@ _request_subchild(Node *node) } EOLIAN static void -_efl_ui_focus_manager_calc_efl_ui_focus_manager_focus_set(Eo *obj, Efl_Ui_Focus_Manager_Calc_Data *pd, Efl_Ui_Focus_Object *focus) +_efl_ui_focus_manager_calc_efl_ui_focus_manager_manager_focus_set(Eo *obj, Efl_Ui_Focus_Manager_Calc_Data *pd, Efl_Ui_Focus_Object *focus) { Node *node, *last; Efl_Ui_Focus_Object *last_focusable = NULL; @@ -1601,7 +1601,7 @@ _convert(Eina_List *node_list) } EOLIAN static Efl_Ui_Focus_Object* -_efl_ui_focus_manager_calc_efl_ui_focus_manager_focus_get(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Manager_Calc_Data *pd) +_efl_ui_focus_manager_calc_efl_ui_focus_manager_manager_focus_get(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Manager_Calc_Data *pd) { Node *upper = NULL; diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.eo b/src/lib/elementary/efl_ui_focus_manager_calc.eo index e5e49bb109..8103262013 100644 --- a/src/lib/elementary/efl_ui_focus_manager_calc.eo +++ b/src/lib/elementary/efl_ui_focus_manager_calc.eo @@ -92,7 +92,7 @@ class Efl.Ui.Focus.Manager.Calc (Efl.Object, Efl.Ui.Focus.Manager) { class.destructor; Efl.Ui.Focus.Manager.move; Efl.Ui.Focus.Manager.request_move; - Efl.Ui.Focus.Manager.focus {get; set;} + Efl.Ui.Focus.Manager.manager_focus {get; set;} Efl.Ui.Focus.Manager.redirect {set; get;} Efl.Ui.Focus.Manager.border_elements {get;} Efl.Ui.Focus.Manager.root {set; get;} diff --git a/src/lib/elementary/efl_ui_focus_manager_root_focus.c b/src/lib/elementary/efl_ui_focus_manager_root_focus.c index 040aba24f7..ce4352d98e 100644 --- a/src/lib/elementary/efl_ui_focus_manager_root_focus.c +++ b/src/lib/elementary/efl_ui_focus_manager_root_focus.c @@ -70,7 +70,7 @@ _efl_ui_focus_manager_root_focus_efl_ui_focus_manager_calc_unregister(Eo *obj, E EOLIAN static void -_efl_ui_focus_manager_root_focus_efl_ui_focus_manager_focus_set(Eo *obj, Efl_Ui_Focus_Manager_Root_Focus_Data *pd, Efl_Ui_Focus_Object *focus) +_efl_ui_focus_manager_root_focus_efl_ui_focus_manager_manager_focus_set(Eo *obj, Efl_Ui_Focus_Manager_Root_Focus_Data *pd, Efl_Ui_Focus_Object *focus) { EINA_SAFETY_ON_NULL_RETURN(focus); efl_ui_focus_manager_focus_set(efl_super(obj, MY_CLASS), _trap(pd, focus)); @@ -78,7 +78,7 @@ _efl_ui_focus_manager_root_focus_efl_ui_focus_manager_focus_set(Eo *obj, Efl_Ui_ EOLIAN static Efl_Ui_Focus_Object* -_efl_ui_focus_manager_root_focus_efl_ui_focus_manager_focus_get(Eo *obj, Efl_Ui_Focus_Manager_Root_Focus_Data *pd) +_efl_ui_focus_manager_root_focus_efl_ui_focus_manager_manager_focus_get(Eo *obj, Efl_Ui_Focus_Manager_Root_Focus_Data *pd) { return _trap(pd, efl_ui_focus_manager_focus_get(efl_super(obj, MY_CLASS))); } diff --git a/src/lib/elementary/efl_ui_focus_manager_root_focus.eo b/src/lib/elementary/efl_ui_focus_manager_root_focus.eo index 90404d5d99..4c86d3d563 100644 --- a/src/lib/elementary/efl_ui_focus_manager_root_focus.eo +++ b/src/lib/elementary/efl_ui_focus_manager_root_focus.eo @@ -3,7 +3,7 @@ class Efl.Ui.Focus.Manager.Root_Focus(Efl.Ui.Focus.Manager.Calc) { implements { Efl.Ui.Focus.Manager.Calc.register; Efl.Ui.Focus.Manager.Calc.unregister; - Efl.Ui.Focus.Manager.focus {set; get;} + Efl.Ui.Focus.Manager.manager_focus {set; get;} Efl.Ui.Focus.Manager.fetch; Efl.Ui.Focus.Manager.logical_end; Efl.Ui.Focus.Manager.border_elements {get;} --
