NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elm: Compress more focus tests into the same list walk 

Since we're already at the top of the list, we can do the WIN_CLASS test
much more cheaply.

Differential Revision: https://phab.enlightenment.org/D7314

Signed-off-by: Derek Foreman <derek.foreman.samsung@gmail.com>
This commit is contained in:
Derek Foreman 2018-11-20 11:20:36 -06:00 committed by Marcel Hollerbach
parent 30be434fb1
commit 45f24b6ef4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/elementary/efl_ui_widget.c
View File

@ -364,18 +364,19 @@ _tree_custom_chain_missing(Eo *obj)
}
static Eina_Bool
_tree_disabled_or_unfocusable(Eo *obj)
_candidacy_exam(Eo *obj)
{
Efl_Ui_Widget *wid = obj;
Efl_Ui_Widget *wid = obj, *top;
do {
ELM_WIDGET_DATA_GET(wid, wid_pd);
if (wid_pd->disabled) return EINA_TRUE;
if (wid_pd->tree_unfocusable) return EINA_TRUE;
top = wid;
} while((wid = elm_widget_parent_get(wid)));
return EINA_FALSE;
return !efl_isa(top, EFL_UI_WIN_CLASS);
}
static void _full_eval(Eo *obj, Elm_Widget_Smart_Data *pd);
@ -485,8 +486,7 @@ _eval_registration_candidate(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool *shou
//can focus can be overridden by the following properties
if ((!pd->parent_obj) ||
(!evas_object_visible_get(obj)) ||
!efl_isa(elm_widget_top_get(obj), EFL_UI_WIN_CLASS) ||
(_tree_disabled_or_unfocusable(obj)) ||
(_candidacy_exam(obj)) ||
(_tree_custom_chain_missing(obj)))
return;