summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-08-23 17:01:03 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-08-23 20:53:20 +0900
commit5e7de75914c1f99e37228b6fb7db309eb3072ab0 (patch)
tree1203642c17c06889c89db7b2104276829bb931a1
parent53c966b79044bb4b78c058072b3baa63cfb62f68 (diff)
widget: Remove focus_tree_unfocusable_handle (EO)
Ref T5363
-rw-r--r--src/lib/elementary/elm_widget.c9
-rw-r--r--src/lib/elementary/elm_widget.eo3
-rw-r--r--src/lib/elementary/elm_widget.h1
3 files changed, 5 insertions, 8 deletions
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 29ec6946c9..25631b7163 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -110,6 +110,7 @@ _on_sub_obj_del(void *data, const Efl_Event *event);
110static void 110static void
111_on_sub_obj_hide(void *data, const Efl_Event *event); 111_on_sub_obj_hide(void *data, const Efl_Event *event);
112static void _propagate_event(void *data, const Efl_Event *eo_event); 112static void _propagate_event(void *data, const Efl_Event *eo_event);
113static void _elm_widget_focus_tree_unfocusable_handle(Eo *obj);
113 114
114EFL_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks, 115EFL_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks,
115 { EFL_EVENT_DEL, _on_sub_obj_del }, 116 { 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
1774 tree_unfocusable = !!tree_unfocusable; 1775 tree_unfocusable = !!tree_unfocusable;
1775 if (sd->tree_unfocusable == tree_unfocusable) return; 1776 if (sd->tree_unfocusable == tree_unfocusable) return;
1776 sd->tree_unfocusable = tree_unfocusable; 1777 sd->tree_unfocusable = tree_unfocusable;
1777 elm_widget_focus_tree_unfocusable_handle(obj); 1778 _elm_widget_focus_tree_unfocusable_handle(obj);
1778 1779
1779 //focus state eval on all children 1780 //focus state eval on all children
1780 _full_eval_children(obj, sd); 1781 _full_eval_children(obj, sd);
@@ -4333,8 +4334,8 @@ _elm_widget_focus_mouse_up_handle(Eo *obj, Elm_Widget_Smart_Data *pd)
4333 } 4334 }
4334} 4335}
4335 4336
4336EOLIAN static void 4337static void
4337_elm_widget_focus_tree_unfocusable_handle(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) 4338_elm_widget_focus_tree_unfocusable_handle(Eo *obj)
4338{ 4339{
4339 if (!elm_widget_parent_get(obj)) 4340 if (!elm_widget_parent_get(obj))
4340 elm_widget_focused_object_clear(obj); 4341 elm_widget_focused_object_clear(obj);
@@ -4345,7 +4346,7 @@ _elm_widget_focus_tree_unfocusable_handle(Eo *obj, Elm_Widget_Smart_Data *_pd EI
4345EOLIAN static void 4346EOLIAN static void
4346_elm_widget_focus_disabled_handle(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) 4347_elm_widget_focus_disabled_handle(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
4347{ 4348{
4348 elm_widget_focus_tree_unfocusable_handle(obj); 4349 _elm_widget_focus_tree_unfocusable_handle(obj);
4349} 4350}
4350 4351
4351EOLIAN static unsigned int 4352EOLIAN static unsigned int
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index ab56301dbc..43a69576bd 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -509,9 +509,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible,
509 @in dir: Elm.Focus_Direction; [[Focus direction]] 509 @in dir: Elm.Focus_Direction; [[Focus direction]]
510 } 510 }
511 } 511 }
512 focus_tree_unfocusable_handle {
513 [[Handle focus tree unfocusable]]
514 }
515 focus_custom_chain_prepend { 512 focus_custom_chain_prepend {
516 [[Prepend object to custom focus chain. 513 [[Prepend object to custom focus chain.
517 514
diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h
index 2b1535968f..db7bff407d 100644
--- a/src/lib/elementary/elm_widget.h
+++ b/src/lib/elementary/elm_widget.h
@@ -754,7 +754,6 @@ EAPI Eina_List *elm_widget_stringlist_get(const char *str);
754EAPI void elm_widget_stringlist_free(Eina_List *list); 754EAPI void elm_widget_stringlist_free(Eina_List *list);
755EAPI void elm_widget_focus_hide_handle(Evas_Object *obj); 755EAPI void elm_widget_focus_hide_handle(Evas_Object *obj);
756EAPI void elm_widget_focus_mouse_up_handle(Evas_Object *obj); 756EAPI void elm_widget_focus_mouse_up_handle(Evas_Object *obj);
757EAPI void elm_widget_focus_tree_unfocusable_handle(Evas_Object *obj);
758EAPI void elm_widget_focus_disabled_handle(Evas_Object *obj); 757EAPI void elm_widget_focus_disabled_handle(Evas_Object *obj);
759EAPI unsigned int elm_widget_focus_order_get(const Evas_Object *obj); 758EAPI unsigned int elm_widget_focus_order_get(const Evas_Object *obj);
760EAPI void elm_widget_activate(Evas_Object *obj, Elm_Activate act); 759EAPI void elm_widget_activate(Evas_Object *obj, Elm_Activate act);