summaryrefslogtreecommitdiff
path: root/src/lib/elementary/efl_ui_widget.c
diff options
context:
space:
mode:
authorDerek Foreman <derek.foreman.samsung@gmail.com>2018-11-20 10:49:40 -0600
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2018-11-22 16:09:39 +0100
commit30be434fb1b5f5495b2fd879248f5c036d8f2c5b (patch)
treefb4554aaca69f991ed6846c3cc7d0f4a4a050d53 /src/lib/elementary/efl_ui_widget.c
parentb8f6323a3699b658eb3c4413c7317cfd61c17bf4 (diff)
elm: Re-order focus tests
Placing the cheapest tests first can save on some heavy walks. Differential Revision: https://phab.enlightenment.org/D7313 Signed-off-by: Derek Foreman <derek.foreman.samsung@gmail.com>
Diffstat (limited to '')
-rw-r--r--src/lib/elementary/efl_ui_widget.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index c5205f96b7..c9572d9b2e 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -483,11 +483,11 @@ _eval_registration_candidate(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool *shou
483 *should = *want_full = EINA_FALSE; 483 *should = *want_full = EINA_FALSE;
484 484
485 //can focus can be overridden by the following properties 485 //can focus can be overridden by the following properties
486 if (!efl_isa(elm_widget_top_get(obj), EFL_UI_WIN_CLASS) || 486 if ((!pd->parent_obj) ||
487 (!pd->parent_obj) || 487 (!evas_object_visible_get(obj)) ||
488 !efl_isa(elm_widget_top_get(obj), EFL_UI_WIN_CLASS) ||
488 (_tree_disabled_or_unfocusable(obj)) || 489 (_tree_disabled_or_unfocusable(obj)) ||
489 (_tree_custom_chain_missing(obj)) || 490 (_tree_custom_chain_missing(obj)))
490 (!evas_object_visible_get(obj)))
491 return; 491 return;
492 492
493 if (pd->can_focus) 493 if (pd->can_focus)