summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel@osg.samsung.com>2017-11-01 15:25:00 +0100
committerMarcel Hollerbach <marcel@osg.samsung.com>2017-11-01 15:26:52 +0100
commitf2da8a7f542f7e2161e173ad5c0d35af25d04337 (patch)
tree81125233693d1200d8d7ec30741bcb0598694883 /src/lib/elementary
parent08d104498c7a72f1e60e030c70f8d809465051c8 (diff)
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
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_calc.c18
1 files 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)
1100} 1100}
1101 1101
1102static Node* 1102static Node*
1103_next_unprepare_node(Node *node) 1103_next(Node *node)
1104{ 1104{
1105 Node *n; 1105 Node *n;
1106 1106
@@ -1145,15 +1145,6 @@ _next_unprepare_node(Node *node)
1145} 1145}
1146 1146
1147static Node* 1147static Node*
1148_next(Node *node)
1149{
1150 //prepare the node itself so if there are probebly no children, then they are here.
1151 efl_ui_focus_object_prepare_logical(node->focusable);
1152
1153 return _next_unprepare_node(node);
1154}
1155
1156static Node*
1157_prev(Node *node) 1148_prev(Node *node)
1158{ 1149{
1159 Node *n = NULL; 1150 Node *n = NULL;
@@ -1216,6 +1207,10 @@ _logical_movement(Efl_Ui_Focus_Manager_Calc_Data *pd EINA_UNUSED, Node *upper, E
1216 } 1207 }
1217 1208
1218 stack = eina_list_append(stack, result); 1209 stack = eina_list_append(stack, result);
1210
1211 if (direction == EFL_UI_FOCUS_DIRECTION_NEXT)
1212 efl_ui_focus_object_prepare_logical(result->focusable);
1213
1219 result = deliver(result); 1214 result = deliver(result);
1220 } while(result && result->type != NODE_TYPE_NORMAL && !result->redirect_manager); 1215 } while(result && result->type != NODE_TYPE_NORMAL && !result->redirect_manager);
1221 1216
@@ -1297,7 +1292,7 @@ _request_subchild(Node *node)
1297 if (target != node) 1292 if (target != node)
1298 efl_ui_focus_object_prepare_logical(target->focusable); 1293 efl_ui_focus_object_prepare_logical(target->focusable);
1299 1294
1300 target = _next_unprepare_node(target); 1295 target = _next(target);
1301 //abort if we are exceeding the childrens of node 1296 //abort if we are exceeding the childrens of node
1302 if (target == node) target = NULL; 1297 if (target == node) target = NULL;
1303 } 1298 }
@@ -1588,6 +1583,7 @@ _efl_ui_focus_manager_calc_efl_ui_focus_manager_fetch(Eo *obj, Efl_Ui_Focus_Mana
1588 //make sure to prepare_logical so next and prev are correctly 1583 //make sure to prepare_logical so next and prev are correctly
1589 if (n->tree.parent) 1584 if (n->tree.parent)
1590 efl_ui_focus_object_prepare_logical(n->tree.parent->focusable); 1585 efl_ui_focus_object_prepare_logical(n->tree.parent->focusable);
1586 efl_ui_focus_object_prepare_logical(n->focusable);
1591 1587
1592#define DIR_CLONE(dir) _convert(DIRECTION_ACCESS(n,dir).partners); 1588#define DIR_CLONE(dir) _convert(DIRECTION_ACCESS(n,dir).partners);
1593 1589