From 1a65b7018d5cbff8f7b7441574499a6bc5fa5925 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Wed, 23 Aug 2017 17:27:04 +0900 Subject: [PATCH] widget: Remove tree_unfocusable from EO It was deprecated (in elm_object API) a very long time ago. Ref T5363 --- src/lib/elementary/elm_widget.c | 14 ++++++++++---- src/lib/elementary/elm_widget.eo | 12 ------------ 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c index 25631b7163..19744a8804 100644 --- a/src/lib/elementary/elm_widget.c +++ b/src/lib/elementary/elm_widget.c @@ -1769,9 +1769,12 @@ _full_eval_children(Eo *obj, Elm_Widget_Smart_Data *sd) * * @ingroup Widget */ -EOLIAN static void -_elm_widget_tree_unfocusable_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool tree_unfocusable) +EAPI void +elm_widget_tree_unfocusable_set(Eo *obj, Eina_Bool tree_unfocusable) { + Elm_Widget_Smart_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS); + if (!sd) return; + tree_unfocusable = !!tree_unfocusable; if (sd->tree_unfocusable == tree_unfocusable) return; sd->tree_unfocusable = tree_unfocusable; @@ -1791,9 +1794,12 @@ _elm_widget_tree_unfocusable_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool t * * @ingroup Widget */ -EOLIAN static Eina_Bool -_elm_widget_tree_unfocusable_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) +EAPI Eina_Bool +elm_widget_tree_unfocusable_get(const Eo *obj) { + Elm_Widget_Smart_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS); + if (!sd) return EINA_FALSE; + return sd->tree_unfocusable; } diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo index 43a69576bd..55a885e332 100644 --- a/src/lib/elementary/elm_widget.eo +++ b/src/lib/elementary/elm_widget.eo @@ -246,18 +246,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, style: string; [[The name of the focus highlight style.]] } } - @property tree_unfocusable { - [[Make the elementary object and its children to be unfocusable (or focusable). - If the tree is set as unfocusable, newest focused object which is not in - this tree will get focus. - This API can be helpful for an object to be deleted. - When an object will be deleted soon, it and its children may not want to - get focus (by focus reverting or by other focus controls). - Then, just use this API before deleting.]] - values { - tree_unfocusable: bool; [[$true for unfocusable, $false for focusable.]] - } - } @property theme { [[Widget theme]] values {