diff options
author | YeongJong Lee <yj34.lee@samsung.com> | 2018-01-31 15:04:26 +0100 |
---|---|---|
committer | Marcel Hollerbach <marcel@osg.samsung.com> | 2018-01-31 15:04:26 +0100 |
commit | d2df4b382f6ef20640f8872e6a354004ab611aae (patch) | |
tree | 7cc82ce0f08a4742c4928a3778c0ee592bbae0b3 | |
parent | f00000df5a2483eb669b52c6c30587c1b0a9078b (diff) | |
download | efl-d2df4b382f6ef20640f8872e6a354004ab611aae.tar.gz |
efl_ui_focus_parent_provider_gen: code refactoring
Summary: remove needless function call and else statement
Reviewers: bu5hm4n
Subscribers: cedric, jpeg
Differential Revision: https://phab.enlightenment.org/D5732
-rw-r--r-- | src/lib/elementary/efl_ui_focus_parent_provider_gen.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/src/lib/elementary/efl_ui_focus_parent_provider_gen.c b/src/lib/elementary/efl_ui_focus_parent_provider_gen.c index b5babe133c..807e67519c 100644 --- a/src/lib/elementary/efl_ui_focus_parent_provider_gen.c +++ b/src/lib/elementary/efl_ui_focus_parent_provider_gen.c @@ -50,30 +50,25 @@ _efl_ui_focus_parent_provider_gen_efl_ui_focus_parent_provider_find_logical_pare { //first check if this item is in the map Elm_Widget_Item *item, *above_gengrid = widget; + Efl_Ui_Widget *parent = elm_widget_parent_widget_get(widget); - if (elm_widget_parent_widget_get(widget) != pd->container) + //move forward so we get the last widget above the gengrid level, + //this may be the widget out of the map + while (parent && parent != pd->container) { - Efl_Ui_Widget *parent = elm_widget_parent_widget_get(widget); - //move forward so we get the last widget above the gengrid level, this may be the widget out of the map - do { - above_gengrid = parent; - parent = elm_widget_parent_widget_get(above_gengrid); - } while(parent && parent != pd->container); + above_gengrid = parent; + parent = elm_widget_parent_widget_get(above_gengrid); } item = eina_hash_find(pd->map, &above_gengrid); efl_ui_focus_object_prepare_logical(pd->container); + if (item) + return item; + // We dont have a map entry - if (!item) - { - return efl_ui_focus_parent_provider_find_logical_parent(pd->provider, widget); - } - else - { - return item; - } + return efl_ui_focus_parent_provider_find_logical_parent(pd->provider, widget); } |