From 2e26d7a6cf51abad9ae8faf1261614387daa3940 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Thu, 19 Oct 2017 11:33:53 +0200 Subject: [PATCH] efl_ui_focus_manager_calc: move the debug output in there reduces the load of debug messages, and the debug messages are now only emitted from the manager that is not the redirect. And the real elements that are focused are printed --- src/lib/elementary/efl_ui_focus_manager_calc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c b/src/lib/elementary/efl_ui_focus_manager_calc.c index 033db69486..3232ca23ce 100644 --- a/src/lib/elementary/efl_ui_focus_manager_calc.c +++ b/src/lib/elementary/efl_ui_focus_manager_calc.c @@ -1288,8 +1288,6 @@ _efl_ui_focus_manager_calc_efl_ui_focus_manager_focus_set(Eo *obj, Efl_Ui_Focus_ node = node_get(obj, pd, focus); if (!node) return; - F_DBG("Manager: %p focusing object %p %s", obj, focus, efl_class_name_get(focus)); - if (node->type == NODE_TYPE_ONLY_LOGICAL && !node->redirect_manager) { Node *target = NULL; @@ -1325,6 +1323,8 @@ _efl_ui_focus_manager_calc_efl_ui_focus_manager_focus_set(Eo *obj, Efl_Ui_Focus_ } } + F_DBG("Manager: %p focusing object %p %s", obj, node->focusable, efl_class_name_get(node->focusable)); + if (eina_list_last_data_get(pd->focus_stack) == node) { //the correct one is focused @@ -1443,11 +1443,12 @@ _efl_ui_focus_manager_calc_efl_ui_focus_manager_move(Eo *obj EINA_UNUSED, Efl_Ui { candidate = efl_ui_focus_manager_request_move(obj, direction); + F_DBG("Manager: %p moved to %p %s in direction %d", obj, candidate, efl_class_name_get(candidate), direction); + if (candidate) efl_ui_focus_manager_focus_set(obj, candidate); } - F_DBG("Manager: %p moved to %p %s in direction %d", obj, candidate, efl_class_name_get(candidate), direction); return candidate; }