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

widget: Remove focus_tree_unfocusable_handle (EO) 

Ref T5363
This commit is contained in:
Jean-Philippe Andre 2017-08-23 17:01:03 +09:00
parent 53c966b790
commit 5e7de75914
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/elementary/elm_widget.c
View File

@ -110,6 +110,7 @@ _on_sub_obj_del(void *data, const Efl_Event *event);
static void
_on_sub_obj_hide(void *data, const Efl_Event *event);
static void _propagate_event(void *data, const Efl_Event *eo_event);
static void _elm_widget_focus_tree_unfocusable_handle(Eo *obj);
EFL_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks,
{ EFL_EVENT_DEL, _on_sub_obj_del },
@ -1774,7 +1775,7 @@ _elm_widget_tree_unfocusable_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool t
tree_unfocusable = !!tree_unfocusable;
if (sd->tree_unfocusable == tree_unfocusable) return;
sd->tree_unfocusable = tree_unfocusable;
elm_widget_focus_tree_unfocusable_handle(obj);
_elm_widget_focus_tree_unfocusable_handle(obj);
//focus state eval on all children
_full_eval_children(obj, sd);
@ -4333,8 +4334,8 @@ _elm_widget_focus_mouse_up_handle(Eo *obj, Elm_Widget_Smart_Data *pd)
}
}
EOLIAN static void
_elm_widget_focus_tree_unfocusable_handle(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
static void
_elm_widget_focus_tree_unfocusable_handle(Eo *obj)
{
if (!elm_widget_parent_get(obj))
elm_widget_focused_object_clear(obj);
@ -4345,7 +4346,7 @@ _elm_widget_focus_tree_unfocusable_handle(Eo *obj, Elm_Widget_Smart_Data *_pd EI
EOLIAN static void
_elm_widget_focus_disabled_handle(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
{
elm_widget_focus_tree_unfocusable_handle(obj);
_elm_widget_focus_tree_unfocusable_handle(obj);
}
EOLIAN static unsigned int

3
src/lib/elementary/elm_widget.eo
View File

@ -509,9 +509,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible,
@in dir: Elm.Focus_Direction; [[Focus direction]]
}
}
focus_tree_unfocusable_handle {
[[Handle focus tree unfocusable]]
}
focus_custom_chain_prepend {
[[Prepend object to custom focus chain.

1
src/lib/elementary/elm_widget.h
View File

@ -754,7 +754,6 @@ EAPI Eina_List *elm_widget_stringlist_get(const char *str);
EAPI void elm_widget_stringlist_free(Eina_List *list);
EAPI void elm_widget_focus_hide_handle(Evas_Object *obj);
EAPI void elm_widget_focus_mouse_up_handle(Evas_Object *obj);
EAPI void elm_widget_focus_tree_unfocusable_handle(Evas_Object *obj);
EAPI void elm_widget_focus_disabled_handle(Evas_Object *obj);
EAPI unsigned int elm_widget_focus_order_get(const Evas_Object *obj);
EAPI void elm_widget_activate(Evas_Object *obj, Elm_Activate act);