From f2da8a7f542f7e2161e173ad5c0d35af25d04337 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Wed, 1 Nov 2017 15:25:00 +0100 Subject: [PATCH] efl_ui_focus_manager: remove strange naming of a function this is just normal next or prev, the prepare is done on the caller side now --- src/lib/elementary/efl_ui_focus_manager_calc.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c b/src/lib/elementary/efl_ui_focus_manager_calc.c index 61c2c7c4d4..5510d56534 100644 --- a/src/lib/elementary/efl_ui_focus_manager_calc.c +++ b/src/lib/elementary/efl_ui_focus_manager_calc.c @@ -1100,7 +1100,7 @@ _prev_item(Node *node) } static Node* -_next_unprepare_node(Node *node) +_next(Node *node) { Node *n; @@ -1144,15 +1144,6 @@ _next_unprepare_node(Node *node) return NULL; } -static Node* -_next(Node *node) -{ - //prepare the node itself so if there are probebly no children, then they are here. - efl_ui_focus_object_prepare_logical(node->focusable); - - return _next_unprepare_node(node); -} - static Node* _prev(Node *node) { @@ -1216,6 +1207,10 @@ _logical_movement(Efl_Ui_Focus_Manager_Calc_Data *pd EINA_UNUSED, Node *upper, E } stack = eina_list_append(stack, result); + + if (direction == EFL_UI_FOCUS_DIRECTION_NEXT) + efl_ui_focus_object_prepare_logical(result->focusable); + result = deliver(result); } while(result && result->type != NODE_TYPE_NORMAL && !result->redirect_manager); @@ -1297,7 +1292,7 @@ _request_subchild(Node *node) if (target != node) efl_ui_focus_object_prepare_logical(target->focusable); - target = _next_unprepare_node(target); + target = _next(target); //abort if we are exceeding the childrens of node if (target == node) target = NULL; } @@ -1588,6 +1583,7 @@ _efl_ui_focus_manager_calc_efl_ui_focus_manager_fetch(Eo *obj, Efl_Ui_Focus_Mana //make sure to prepare_logical so next and prev are correctly if (n->tree.parent) efl_ui_focus_object_prepare_logical(n->tree.parent->focusable); + efl_ui_focus_object_prepare_logical(n->focusable); #define DIR_CLONE(dir) _convert(DIRECTION_ACCESS(n,dir).partners);