From 8a20251795317a948f5e72d8fcd996b1e5983984 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Wed, 23 Aug 2017 19:25:44 +0900 Subject: [PATCH] widget: Remove highlight_in_theme from EO Removes EO APIs: - highlight_in_theme - access_highlight_in_theme Ref T5363 --- src/lib/elementary/elm_widget.c | 32 ++++++++++++++++++++++++-------- src/lib/elementary/elm_widget.eo | 12 ------------ 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c index abbae70..26b676f 100644 --- a/src/lib/elementary/elm_widget.c +++ b/src/lib/elementary/elm_widget.c @@ -1856,9 +1856,13 @@ _elm_widget_highlight_ignore_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) return sd->highlight_ignore; } -EOLIAN static void -_elm_widget_highlight_in_theme_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Bool highlight) +/** @internal */ +EAPI void +elm_widget_highlight_in_theme_set(Eo *obj, Eina_Bool highlight) { + Elm_Widget_Smart_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS); + if (!sd) return; + sd->highlight_in_theme = !!highlight; /* FIXME: if focused, it should switch from one mode to the other */ } @@ -1875,21 +1879,33 @@ _elm_widget_highlight_in_theme_update(Eo *obj) } } -EOLIAN static Eina_Bool -_elm_widget_highlight_in_theme_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) +/** @internal */ +EAPI Eina_Bool +elm_widget_highlight_in_theme_get(const Eo *obj) { + Elm_Widget_Smart_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS); + if (!sd) return EINA_FALSE; + return sd->highlight_in_theme; } -EOLIAN static void -_elm_widget_access_highlight_in_theme_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Bool highlight) +/** @internal */ +EAPI void +elm_widget_access_highlight_in_theme_set(Eo *obj, Eina_Bool highlight) { + Elm_Widget_Smart_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS); + if (!sd) return; + sd->access_highlight_in_theme = !!highlight; } -EOLIAN static Eina_Bool -_elm_widget_access_highlight_in_theme_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) +/** @internal */ +EAPI Eina_Bool +elm_widget_access_highlight_in_theme_get(const Eo *obj) { + Elm_Widget_Smart_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS); + if (!sd) return EINA_FALSE; + return sd->access_highlight_in_theme; } diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo index 2c9454e..ed2b337 100644 --- a/src/lib/elementary/elm_widget.eo +++ b/src/lib/elementary/elm_widget.eo @@ -273,12 +273,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, } } } - @property highlight_in_theme { - [[Highlight in theme property]] - values { - highlight: bool; [[$true if widget gets hightlight, $false otherwise]] - } - } @property access_info { [[Accessibility information]] values { @@ -291,12 +285,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, lock: bool; [[$true if drag is locked on X axis, $false otherwise]] } } - @property access_highlight_in_theme { - [[Accessibility highlight in theme]] - values { - highlight: bool; [[$true if highlighted, $false otherwise]] - } - } @property focus_region_show_mode { [[Control the focus_region_show mode.]] values { -- 2.7.4