conr2d pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=97c10e9346837fcd354fe9144d57cd8d63654d00
commit 97c10e9346837fcd354fe9144d57cd8d63654d00 Author: Jeeyong Um <[email protected]> Date: Wed Jun 14 15:20:23 2017 +0900 scroller: Remove propagate_events to avoid name collision --- src/lib/elementary/elm_scroller.c | 15 ++++++--------- src/lib/elementary/elm_scroller.eo | 19 ------------------- src/lib/elementary/elm_scroller_legacy.h | 25 +++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index 6703addddd..12739a3839 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -1413,19 +1413,16 @@ elm_scroller_wheel_disabled_get(const Evas_Object *obj) return elm_interface_scrollable_wheel_disabled_get((Eo *) obj); } -EOLIAN static void -_elm_scroller_propagate_events_set(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED, Eina_Bool propagation) +EAPI void +elm_scroller_propagate_events_set(Evas_Object *obj, Eina_Bool propagation) { - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - - evas_object_propagate_events_set(wd->resize_obj, propagation); + evas_object_propagate_events_set(elm_layout_edje_get(obj), propagation); } -EOLIAN static Eina_Bool -_elm_scroller_propagate_events_get(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED) +EAPI Eina_Bool +elm_scroller_propagate_events_get(const Evas_Object *obj) { - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); - return evas_object_propagate_events_get(wd->resize_obj); + return evas_object_propagate_events_get(elm_layout_edje_get(obj)); } static void diff --git a/src/lib/elementary/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo index e869a52e15..7f0a6cf290 100644 --- a/src/lib/elementary/elm_scroller.eo +++ b/src/lib/elementary/elm_scroller.eo @@ -7,25 +7,6 @@ class Elm.Scroller (Elm.Layout, Elm.Interface_Scrollable, eo_prefix: elm_obj_scroller; event_prefix: elm_scroller; methods { - @property propagate_events { - set { - [[Set event propagation on a scroller - - This enables or disables event propagation from the scroller - content to the scroller and its parent. By default event - propagation is enabled. - ]] - } - get { - [[Get event propagation for a scroller - - This gets the event propagation for a scroller. - ]] - } - values { - propagation: bool; [[The propagation state]] - } - } @property custom_widget_base_theme { set { [[Set custom theme elements for the scroller]] diff --git a/src/lib/elementary/elm_scroller_legacy.h b/src/lib/elementary/elm_scroller_legacy.h index 28e5d785e6..3b8dffad46 100644 --- a/src/lib/elementary/elm_scroller_legacy.h +++ b/src/lib/elementary/elm_scroller_legacy.h @@ -559,3 +559,28 @@ EAPI void elm_scroller_wheel_disabled_set(Evas_Object * * @ingroup Elm_Scroller */ EAPI Eina_Bool elm_scroller_wheel_disabled_get(const Evas_Object *obj); + +/** + * @brief Set event propagation on a scroller + * + * This enables or disables event propagation from the scroller content to the + * scroller and its parent. By default event propagation is enabled. + * + * @param[in] obj The scroller object + * @param[in] propagation The propagation state + * + * @ingroup Elm_Scroller + */ +EAPI void elm_scroller_propagate_events_set(Evas_Object *obj, Eina_Bool propagation); + +/** + * @brief Get event propagation for a scroller + * + * This gets the event propagation for a scroller. + * + * @param[in] obj The scroller object + * @return The propagation state + * + * @ingroup Elm_Scroller + */ +EAPI Eina_Bool elm_scroller_propagate_events_get(const Evas_Object *obj); --
