From 67996afbf66de827a6912a43e5b4a85a2ce5a314 Mon Sep 17 00:00:00 2001 From: Amitesh Singh Date: Thu, 16 Nov 2017 11:06:14 +0900 Subject: [PATCH] Efl.Ui.Slider: make indicator_visible_mode() legacy APIs Ref T6376 --- src/lib/elementary/efl_ui_slider.c | 31 +++++++++++++++----------- src/lib/elementary/efl_ui_slider.eo | 7 ------ src/lib/elementary/elm_slider_legacy.h | 21 +++++++++++++++++ 3 files changed, 39 insertions(+), 20 deletions(-) diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c index 43c44417d6..095fad8662 100644 --- a/src/lib/elementary/efl_ui_slider.c +++ b/src/lib/elementary/efl_ui_slider.c @@ -1246,19 +1246,6 @@ _efl_ui_slider_step_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd) return sd->step; } -EOLIAN static void -_efl_ui_slider_indicator_visible_mode_set(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd, Elm_Slider_Indicator_Visible_Mode indicator_visible_mode) -{ - if (sd->indicator_visible_mode == indicator_visible_mode) return; - sd->indicator_visible_mode = indicator_visible_mode; -} - -EOLIAN static Elm_Slider_Indicator_Visible_Mode -_efl_ui_slider_indicator_visible_mode_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd) -{ - return sd->indicator_visible_mode; -} - EOLIAN static Eina_Bool _efl_ui_slider_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Slider_Data *sd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED) { @@ -1746,6 +1733,24 @@ elm_slider_indicator_show_get(const Evas_Object *obj) EFL_UI_SLIDER_DATA_GET_OR_RETURN(obj, sd, EINA_FALSE); return sd->indicator_show; } + +EAPI void +elm_slider_indicator_visible_mode_set(Evas_Object *obj, Elm_Slider_Indicator_Visible_Mode indicator_visible_mode) +{ + EFL_UI_SLIDER_DATA_GET_OR_RETURN(obj, sd); + + if (sd->indicator_visible_mode == indicator_visible_mode) return; + sd->indicator_visible_mode = indicator_visible_mode; +} + +EAPI Elm_Slider_Indicator_Visible_Mode +elm_slider_indicator_visible_mode_get(const Evas_Object *obj) +{ + EFL_UI_SLIDER_DATA_GET_OR_RETURN(obj, sd, ELM_SLIDER_INDICATOR_VISIBLE_MODE_NONE); + + return sd->indicator_visible_mode; +} + /* Internal EO APIs and hidden overrides */ ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(efl_ui_slider) diff --git a/src/lib/elementary/efl_ui_slider.eo b/src/lib/elementary/efl_ui_slider.eo index 845e5b0168..608ddf124f 100644 --- a/src/lib/elementary/efl_ui_slider.eo +++ b/src/lib/elementary/efl_ui_slider.eo @@ -30,13 +30,6 @@ class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Direction, step: double; [[The step value.]] } } - @property indicator_visible_mode { - [[Set/Get the visible mode of indicator. - ]] - values { - indicator_visible_mode: Efl.Ui.Slider.Indicator_Visible_Mode; [[The indicator visible mode.]] - } - } } parts { indicator: Efl.Ui.Slider.Part; [[A floating indicator above the slider.]] diff --git a/src/lib/elementary/elm_slider_legacy.h b/src/lib/elementary/elm_slider_legacy.h index 312b087b23..f117e15af0 100644 --- a/src/lib/elementary/elm_slider_legacy.h +++ b/src/lib/elementary/elm_slider_legacy.h @@ -329,4 +329,25 @@ EAPI void elm_slider_indicator_show_set(Evas_Object *obj, Eina_Bool show); */ EAPI Eina_Bool elm_slider_indicator_show_get(const Evas_Object *obj); +/** + * @brief Set/Get the visible mode of indicator. + * + * @param[in] obj The object. + * @param[in] indicator_visible_mode The indicator visible mode. + * + * @ingroup Elm_Slider + */ +EAPI void elm_slider_indicator_visible_mode_set(Evas_Object *obj, Elm_Slider_Indicator_Visible_Mode indicator_visible_mode); + +/** + * @brief Set/Get the visible mode of indicator. + * + * @param[in] obj The object. + * + * @return The indicator visible mode. + * + * @ingroup Elm_Slider + */ +EAPI Elm_Slider_Indicator_Visible_Mode elm_slider_indicator_visible_mode_get(const Evas_Object *obj); + #include "efl_ui_slider.eo.legacy.h"