forked from enlightenment/efl
scroller: Remove propagate_events to avoid name collision
This commit is contained in:
parent
efbd62c40a
commit
97c10e9346
|
@ -1413,19 +1413,16 @@ elm_scroller_wheel_disabled_get(const Evas_Object *obj)
|
||||||
return elm_interface_scrollable_wheel_disabled_get((Eo *) obj);
|
return elm_interface_scrollable_wheel_disabled_get((Eo *) obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EAPI void
|
||||||
_elm_scroller_propagate_events_set(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED, Eina_Bool propagation)
|
elm_scroller_propagate_events_set(Evas_Object *obj, Eina_Bool propagation)
|
||||||
{
|
{
|
||||||
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
|
evas_object_propagate_events_set(elm_layout_edje_get(obj), propagation);
|
||||||
|
|
||||||
evas_object_propagate_events_set(wd->resize_obj, propagation);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EAPI Eina_Bool
|
||||||
_elm_scroller_propagate_events_get(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED)
|
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(elm_layout_edje_get(obj));
|
||||||
return evas_object_propagate_events_get(wd->resize_obj);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -7,25 +7,6 @@ class Elm.Scroller (Elm.Layout, Elm.Interface_Scrollable,
|
||||||
eo_prefix: elm_obj_scroller;
|
eo_prefix: elm_obj_scroller;
|
||||||
event_prefix: elm_scroller;
|
event_prefix: elm_scroller;
|
||||||
methods {
|
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 {
|
@property custom_widget_base_theme {
|
||||||
set {
|
set {
|
||||||
[[Set custom theme elements for the scroller]]
|
[[Set custom theme elements for the scroller]]
|
||||||
|
|
|
@ -559,3 +559,28 @@ EAPI void elm_scroller_wheel_disabled_set(Evas_Object *
|
||||||
* @ingroup Elm_Scroller
|
* @ingroup Elm_Scroller
|
||||||
*/
|
*/
|
||||||
EAPI Eina_Bool elm_scroller_wheel_disabled_get(const Evas_Object *obj);
|
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);
|
||||||
|
|
Loading…
Reference in New Issue