summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-02-14 21:14:52 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-02-15 13:11:01 -0500
commit8530bbc57ba32999e99af21ca7d89bb6d30bf9df (patch)
tree1cd531e6fbe186ee6c35f6756a8a222b647548ba /src/lib/elementary
parenta6566ef8ae94812951a812ea8da2e94fdfe6e611 (diff)
downloadefl-8530bbc57ba32999e99af21ca7d89bb6d30bf9df.tar.gz
elm_interface_scrollable: repeat_events -> content_events
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c4
-rw-r--r--src/lib/elementary/elm_interface_scrollable.eo2
-rw-r--r--src/lib/elementary/elm_scroller.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c
index 0980802312..c93ae84b1f 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -4568,7 +4568,7 @@ _elm_interface_scrollable_movement_block_get(Eo *obj EINA_UNUSED, Elm_Scrollable
}
EOLIAN static void
-_elm_interface_scrollable_loop_set(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_Interface_Data *sid, Eina_Bool loop_h, Eina_Bool loop_v)
+_elm_interface_scrollable_content_loop_set(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_Interface_Data *sid, Eina_Bool loop_h, Eina_Bool loop_v)
{
if (sid->loop_h == loop_h && sid->loop_v == loop_v) return;
@@ -4587,7 +4587,7 @@ _elm_interface_scrollable_loop_set(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_Int
}
EOLIAN static void
-_elm_interface_scrollable_loop_get(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_Interface_Data *sid, Eina_Bool *loop_h, Eina_Bool *loop_v)
+_elm_interface_scrollable_content_loop_get(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_Interface_Data *sid, Eina_Bool *loop_h, Eina_Bool *loop_v)
{
*loop_h = sid->loop_h;
*loop_v = sid->loop_v;
diff --git a/src/lib/elementary/elm_interface_scrollable.eo b/src/lib/elementary/elm_interface_scrollable.eo
index b1b89348ed..e6f1937ea5 100644
--- a/src/lib/elementary/elm_interface_scrollable.eo
+++ b/src/lib/elementary/elm_interface_scrollable.eo
@@ -274,7 +274,7 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Ui.Focus.Manager.Sub, Efl.
y: int; [[Y coordinate]]
}
}
- @property loop {
+ @property content_loop {
[[Controls an infinite loop for a scroller.
@since 1.14]]
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index 21cfd04710..72ba9c2a8a 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -1259,7 +1259,7 @@ elm_scroller_loop_set(Evas_Object *obj,
sd->loop_h = loop_h;
sd->loop_v = loop_v;
- elm_interface_scrollable_loop_set(obj, loop_h, loop_v);
+ elm_interface_scrollable_content_loop_set(obj, loop_h, loop_v);
if (sd->content)
{
@@ -1297,7 +1297,7 @@ elm_scroller_loop_get(const Evas_Object *obj,
{
ELM_SCROLLABLE_CHECK(obj);
- elm_interface_scrollable_loop_get(obj, loop_h, loop_v);
+ elm_interface_scrollable_content_loop_get(obj, loop_h, loop_v);
}
EAPI void