enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

elm: speed up _eval_registration_candidate 

combining _tree_unfocusable and _tree_disabled into a single function
reduces eo overhead.  This saves a few ms at startup in elementary_test.

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

Signed-off-by: Derek Foreman <derek.foreman.samsung@gmail.com>
This commit is contained in:
Derek Foreman 2018-11-19 15:30:25 -06:00 committed by Marcel Hollerbach
parent 390871832d
commit a4e4343082
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -337,20 +337,6 @@ _efl_ui_widget_focus_highlight_style_get(const Eo *obj, Elm_Widget_Smart_Data *s
return NULL;
}
static Eina_Bool
_tree_unfocusable(Eo *obj)
{
Efl_Ui_Widget *wid = obj;
do {
ELM_WIDGET_DATA_GET(wid, wid_pd);
if (wid_pd->tree_unfocusable) return EINA_TRUE;
} while((wid = elm_widget_parent_widget_get(wid)));
return EINA_FALSE;
}
static Eina_Bool
_tree_custom_chain_missing(Eo *obj)
{
@ -378,7 +364,7 @@ _tree_custom_chain_missing(Eo *obj)
}
static Eina_Bool
_tree_disabled(Eo *obj)
_tree_disabled_or_unfocusable(Eo *obj)
{
Efl_Ui_Widget *wid = obj;
@ -386,6 +372,7 @@ _tree_disabled(Eo *obj)
ELM_WIDGET_DATA_GET(wid, wid_pd);
if (wid_pd->disabled) return EINA_TRUE;
if (wid_pd->tree_unfocusable) return EINA_TRUE;
} while((wid = elm_widget_parent_widget_get(wid)));
return EINA_FALSE;
@ -498,8 +485,7 @@ _eval_registration_candidate(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool *shou
//can focus can be overridden by the following properties
if (!efl_isa(elm_widget_top_get(obj), EFL_UI_WIN_CLASS) ||
(!pd->parent_obj) ||
(_tree_unfocusable(obj)) ||
(_tree_disabled(obj)) ||
(_tree_disabled_or_unfocusable(obj)) ||
(_tree_custom_chain_missing(obj)) ||
(!evas_object_visible_get(obj)))
return;