bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=74b432774617d9395e46beb7f7de33b1ba3699c3
commit 74b432774617d9395e46beb7f7de33b1ba3699c3 Author: Marcel Hollerbach <[email protected]> Date: Fri Dec 23 13:48:00 2016 +0100 update according to cedrics review comments --- src/lib/elementary/efl_ui_focus_manager.c | 12 +++++++----- src/lib/elementary/efl_ui_focus_manager_sub.c | 4 +--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lib/elementary/efl_ui_focus_manager.c b/src/lib/elementary/efl_ui_focus_manager.c index 8056d05..75a60eb 100644 --- a/src/lib/elementary/efl_ui_focus_manager.c +++ b/src/lib/elementary/efl_ui_focus_manager.c @@ -844,7 +844,7 @@ _iterator_next(Border_Elements_Iterator *it, void **data) { Node *node; - while(eina_iterator_next(it->real_iterator, (void**)&node)) + EINA_ITERATOR_FOREACH(it->real_iterator, node) { for(int i = 0 ;i < NODE_DIRECTIONS_COUNT; i++) { @@ -902,15 +902,17 @@ _no_history_element(Eina_Hash *node_hash) iter = eina_hash_iterator_data_new(node_hash); - do + EINA_ITERATOR_FOREACH(iter, upper) { - if (!eina_iterator_next(iter, (void**)&upper)) - return NULL; + if (upper->type == NODE_TYPE_NORMAL) + break; } - while (upper->type != NODE_TYPE_NORMAL); eina_iterator_free(iter); + if (upper->type != NODE_TYPE_NORMAL) + return NULL; + return upper; } diff --git a/src/lib/elementary/efl_ui_focus_manager_sub.c b/src/lib/elementary/efl_ui_focus_manager_sub.c index 5bd77f7..8527b1f 100644 --- a/src/lib/elementary/efl_ui_focus_manager_sub.c +++ b/src/lib/elementary/efl_ui_focus_manager_sub.c @@ -122,8 +122,6 @@ _border_unregister(Eo *obj, Efl_Ui_Focus_Manager_Sub_Data *pd) if (node == elem) continue; _unregister(obj, manager, node); } - - pd->current_border = NULL; } static void @@ -137,7 +135,7 @@ _parent_manager_pre_flush(void *data, const Efl_Event *ev EINA_UNUSED) } static void -_redirect_changed_cb(void *data, const Efl_Event *ev) +_redirect_changed_cb(void *data, const Efl_Event *ev EINA_UNUSED) { //if (efl_ui_focus_manager_redirect_get(ev->object) != data) return; --
