summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-05 17:00:37 -0500
committerCedric BAIL <cedric.bail@free.fr>2019-03-07 14:16:13 -0800
commitef173e184f16d231cbfc8f86c50a5e527d9e6cd0 (patch)
treec1fdb346f15b6d0726d2a17bc26295a2c4d73b1d
parent6155a3df3c7f8947f825b44fff494ce28367a847 (diff)
elm_scroller: remove all legacy usage from eo files
this takes the current generated output from eolian for legacy code in efl and adds it to the tree, then removes legacy references from the corresponding eo files. in the case where the entire eo file was for a legacy object, that eo file has been removed from the tree ref T7724 Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D8196
-rw-r--r--src/Makefile_Elementary.am5
-rw-r--r--src/lib/elementary/elm_conform.c2
-rw-r--r--src/lib/elementary/elm_scroller.c4
-rw-r--r--src/lib/elementary/elm_scroller.eo78
-rw-r--r--src/lib/elementary/elm_scroller_eo.c150
-rw-r--r--src/lib/elementary/elm_scroller_eo.h183
-rw-r--r--src/lib/elementary/elm_scroller_eo.legacy.c18
-rw-r--r--src/lib/elementary/elm_scroller_eo.legacy.h56
-rw-r--r--src/lib/elementary/elm_scroller_legacy.h2
-rw-r--r--src/lib/elementary/meson.build3
10 files changed, 417 insertions, 84 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 66c5077..2c5c61b 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -183,7 +183,6 @@ elm_private_eolian_files = \
183# Legacy classes - not part of public EO API 183# Legacy classes - not part of public EO API
184elm_legacy_eolian_files = \ 184elm_legacy_eolian_files = \
185 lib/elementary/efl_ui_clock_legacy.eo \ 185 lib/elementary/efl_ui_clock_legacy.eo \
186 lib/elementary/elm_scroller.eo \
187 lib/elementary/elm_sys_notify_interface.eo \ 186 lib/elementary/elm_sys_notify_interface.eo \
188 lib/elementary/elm_sys_notify.eo \ 187 lib/elementary/elm_sys_notify.eo \
189 lib/elementary/elm_sys_notify_dbus.eo \ 188 lib/elementary/elm_sys_notify_dbus.eo \
@@ -381,6 +380,8 @@ lib/elementary/elm_prefs_eo.c \
381lib/elementary/elm_prefs_eo.legacy.c \ 380lib/elementary/elm_prefs_eo.legacy.c \
382lib/elementary/elm_route_eo.c \ 381lib/elementary/elm_route_eo.c \
383lib/elementary/elm_route_eo.legacy.c \ 382lib/elementary/elm_route_eo.legacy.c \
383lib/elementary/elm_scroller_eo.c \
384lib/elementary/elm_scroller_eo.legacy.c \
384$(NULL) 385$(NULL)
385 386
386elm_legacy_eo_headers = \ 387elm_legacy_eo_headers = \
@@ -554,6 +555,8 @@ lib/elementary/elm_prefs_eo.h \
554lib/elementary/elm_prefs_eo.legacy.h \ 555lib/elementary/elm_prefs_eo.legacy.h \
555lib/elementary/elm_route_eo.h \ 556lib/elementary/elm_route_eo.h \
556lib/elementary/elm_route_eo.legacy.h \ 557lib/elementary/elm_route_eo.legacy.h \
558lib/elementary/elm_scroller_eo.h \
559lib/elementary/elm_scroller_eo.legacy.h \
557$(NULL) 560$(NULL)
558 561
559 562
diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c
index 47db121..a3c87cd 100644
--- a/src/lib/elementary/elm_conform.c
+++ b/src/lib/elementary/elm_conform.c
@@ -11,7 +11,7 @@
11#include "elm_widget_conform.h" 11#include "elm_widget_conform.h"
12#include "elm_widget_layout.h" 12#include "elm_widget_layout.h"
13#include "elm_widget_plug.h" 13#include "elm_widget_plug.h"
14#include "elm_scroller.eo.h" 14#include "elm_scroller_eo.h"
15#include "elm_genlist_eo.h" 15#include "elm_genlist_eo.h"
16#include "elm_conformant_eo.h" 16#include "elm_conformant_eo.h"
17 17
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index ab53acc..925f805 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -13,7 +13,7 @@
13#include "elm_widget_layout.h" 13#include "elm_widget_layout.h"
14#include "elm_widget_scroller.h" 14#include "elm_widget_scroller.h"
15 15
16#include "elm_scroller.eo.h" 16#include "elm_scroller_eo.h"
17#include "elm_scroller_part.eo.h" 17#include "elm_scroller_part.eo.h"
18#include "elm_part_helper.h" 18#include "elm_part_helper.h"
19 19
@@ -1390,4 +1390,4 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_scroller, ELM_SCROLLER, Elm_Scroller_Data)
1390 ELM_LAYOUT_SIZING_EVAL_OPS(elm_scroller), \ 1390 ELM_LAYOUT_SIZING_EVAL_OPS(elm_scroller), \
1391 EFL_CANVAS_GROUP_ADD_OPS(elm_scroller) 1391 EFL_CANVAS_GROUP_ADD_OPS(elm_scroller)
1392 1392
1393#include "elm_scroller.eo.c" 1393#include "elm_scroller_eo.c"
diff --git a/src/lib/elementary/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo
deleted file mode 100644
index 563eb42..0000000
--- a/src/lib/elementary/elm_scroller.eo
+++ /dev/null
@@ -1,78 +0,0 @@
1class Elm.Scroller extends Efl.Ui.Layout_Base implements Elm.Interface_Scrollable,
2 Efl.Access.Widget.Action,
3 Efl.Ui.Scrollable, Efl.Content, Efl.Ui.Legacy
4{
5 [[Elementary scroller class]]
6 legacy_prefix: elm_scroller;
7 eo_prefix: elm_obj_scroller;
8 event_prefix: elm_scroller;
9 methods {
10 @property custom_widget_base_theme {
11 set {
12 [[Set custom theme elements for the scroller]]
13 }
14 values {
15 klass: string; [[Klass name]]
16 group: string; [[Group name]]
17 }
18 }
19 page_scroll_limit_set @const {
20 [[Set the maximum of the movable page at a flicking.
21
22 The value of maximum movable page should be more than 1.
23
24 @since 1.8
25 ]]
26 params {
27 @in page_limit_h: int; [[The maximum of the movable horizontal page]]
28 @in page_limit_v: int; [[The maximum of the movable vertical page]]
29 }
30 }
31 page_scroll_limit_get @const {
32 [[Get the maximum of the movable page at a flicking.
33
34 @since 1.8
35 ]]
36 params {
37 @in page_limit_h: ptr(int); [[The maximum of the movable horizontal page]]
38 @in page_limit_v: ptr(int); [[The maximum of the movable vertical page]]
39 }
40 }
41 }
42 implements {
43 class.constructor;
44 Efl.Object.constructor;
45 Efl.Gfx.Entity.position { set; }
46 Efl.Gfx.Entity.size { set; }
47 Efl.Canvas.Group.group_member_add;
48 Efl.Content.content { get; set; }
49 Efl.Content.content_unset;
50 Efl.Ui.Widget.theme_apply;
51 Efl.Ui.Widget.on_access_activate;
52 Efl.Ui.Widget.widget_sub_object_del;
53 Efl.Ui.Widget.widget_input_event_handler;
54 Elm.Interface_Scrollable.page_size { set; }
55 Elm.Interface_Scrollable.policy { set; }
56 Elm.Interface_Scrollable.single_direction { get; set; }
57 Efl.Access.Widget.Action.elm_actions { get; }
58 Efl.Part.part_get;
59 Efl.Ui.Widget.focus_state_apply;
60 }
61 events {
62 scroll,page,changed: void; [[Called when scroll page changed]]
63 hbar,unpress: void; [[Called when horizontal bar is no longer pressed]]
64 hbar,press: void; [[Called when horizontal bar is pressed]]
65 hbar,drag: void; [[Called when horizontal bar is dragged]]
66 vbar,unpress: void; [[Called when vertical bar is no longer pressed]]
67 vbar,press: void; [[Called when vertical bar is pressed]]
68 vbar,drag: void; [[Called when vertical bar is dragged]]
69 scroll,left: void; [[Called when scrolling to left]]
70 scroll,right: void; [[Called when scrolling to right]]
71 scroll,up: void; [[Called scrolled upwards]]
72 scroll,down: void; [[Called when scrolled downwards]]
73 edge,left: void; [[Called when hitting the left edge]]
74 edge,right: void; [[Called when hitting the right edge]]
75 edge,top: void; [[Called when hitting the top edge]]
76 edge,bottom: void; [[Called when hitting the bottom edge]]
77 }
78}
diff --git a/src/lib/elementary/elm_scroller_eo.c b/src/lib/elementary/elm_scroller_eo.c
new file mode 100644
index 0000000..aa977dd
--- /dev/null
+++ b/src/lib/elementary/elm_scroller_eo.c
@@ -0,0 +1,150 @@
1EWAPI const Efl_Event_Description _ELM_SCROLLER_EVENT_SCROLL_PAGE_CHANGED =
2 EFL_EVENT_DESCRIPTION("scroll,page,changed");
3EWAPI const Efl_Event_Description _ELM_SCROLLER_EVENT_HBAR_UNPRESS =
4 EFL_EVENT_DESCRIPTION("hbar,unpress");
5EWAPI const Efl_Event_Description _ELM_SCROLLER_EVENT_HBAR_PRESS =
6 EFL_EVENT_DESCRIPTION("hbar,press");
7EWAPI const Efl_Event_Description _ELM_SCROLLER_EVENT_HBAR_DRAG =
8 EFL_EVENT_DESCRIPTION("hbar,drag");
9EWAPI const Efl_Event_Description _ELM_SCROLLER_EVENT_VBAR_UNPRESS =
10 EFL_EVENT_DESCRIPTION("vbar,unpress");
11EWAPI const Efl_Event_Description _ELM_SCROLLER_EVENT_VBAR_PRESS =
12 EFL_EVENT_DESCRIPTION("vbar,press");
13EWAPI const Efl_Event_Description _ELM_SCROLLER_EVENT_VBAR_DRAG =
14 EFL_EVENT_DESCRIPTION("vbar,drag");
15EWAPI const Efl_Event_Description _ELM_SCROLLER_EVENT_SCROLL_LEFT =
16 EFL_EVENT_DESCRIPTION("scroll,left");
17EWAPI const Efl_Event_Description _ELM_SCROLLER_EVENT_SCROLL_RIGHT =
18 EFL_EVENT_DESCRIPTION("scroll,right");
19EWAPI const Efl_Event_Description _ELM_SCROLLER_EVENT_SCROLL_UP =
20 EFL_EVENT_DESCRIPTION("scroll,up");
21EWAPI const Efl_Event_Description _ELM_SCROLLER_EVENT_SCROLL_DOWN =
22 EFL_EVENT_DESCRIPTION("scroll,down");
23EWAPI const Efl_Event_Description _ELM_SCROLLER_EVENT_EDGE_LEFT =
24 EFL_EVENT_DESCRIPTION("edge,left");
25EWAPI const Efl_Event_Description _ELM_SCROLLER_EVENT_EDGE_RIGHT =
26 EFL_EVENT_DESCRIPTION("edge,right");
27EWAPI const Efl_Event_Description _ELM_SCROLLER_EVENT_EDGE_TOP =
28 EFL_EVENT_DESCRIPTION("edge,top");
29EWAPI const Efl_Event_Description _ELM_SCROLLER_EVENT_EDGE_BOTTOM =
30 EFL_EVENT_DESCRIPTION("edge,bottom");
31
32void _elm_scroller_custom_widget_base_theme_set(Eo *obj, Elm_Scroller_Data *pd, const char *klass, const char *group);
33
34EOAPI EFL_VOID_FUNC_BODYV(elm_obj_scroller_custom_widget_base_theme_set, EFL_FUNC_CALL(klass, group), const char *klass, const char *group);
35
36void _elm_scroller_page_scroll_limit_set(const Eo *obj, Elm_Scroller_Data *pd, int page_limit_h, int page_limit_v);
37
38EOAPI EFL_VOID_FUNC_BODYV_CONST(elm_obj_scroller_page_scroll_limit_set, EFL_FUNC_CALL(page_limit_h, page_limit_v), int page_limit_h, int page_limit_v);
39
40void _elm_scroller_page_scroll_limit_get(const Eo *obj, Elm_Scroller_Data *pd, int *page_limit_h, int *page_limit_v);
41
42EOAPI EFL_VOID_FUNC_BODYV_CONST(elm_obj_scroller_page_scroll_limit_get, EFL_FUNC_CALL(page_limit_h, page_limit_v), int *page_limit_h, int *page_limit_v);
43
44Efl_Object *_elm_scroller_efl_object_constructor(Eo *obj, Elm_Scroller_Data *pd);
45
46
47void _elm_scroller_efl_gfx_entity_position_set(Eo *obj, Elm_Scroller_Data *pd, Eina_Position2D pos);
48
49
50void _elm_scroller_efl_gfx_entity_size_set(Eo *obj, Elm_Scroller_Data *pd, Eina_Size2D size);
51
52
53void _elm_scroller_efl_canvas_group_group_member_add(Eo *obj, Elm_Scroller_Data *pd, Efl_Canvas_Object *sub_obj);
54
55
56Eina_Bool _elm_scroller_efl_content_content_set(Eo *obj, Elm_Scroller_Data *pd, Efl_Gfx_Entity *content);
57
58
59Efl_Gfx_Entity *_elm_scroller_efl_content_content_get(const Eo *obj, Elm_Scroller_Data *pd);
60
61
62Efl_Gfx_Entity *_elm_scroller_efl_content_content_unset(Eo *obj, Elm_Scroller_Data *pd);
63
64
65Eina_Error _elm_scroller_efl_ui_widget_theme_apply(Eo *obj, Elm_Scroller_Data *pd);
66
67
68Eina_Bool _elm_scroller_efl_ui_widget_on_access_activate(Eo *obj, Elm_Scroller_Data *pd, Efl_Ui_Activate act);
69
70
71Eina_Bool _elm_scroller_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Scroller_Data *pd, Efl_Canvas_Object *sub_obj);
72
73
74Eina_Bool _elm_scroller_efl_ui_widget_widget_input_event_handler(Eo *obj, Elm_Scroller_Data *pd, const Efl_Event *eo_event, Efl_Canvas_Object *source);
75
76
77void _elm_scroller_elm_interface_scrollable_page_size_set(Eo *obj, Elm_Scroller_Data *pd, int x, int y);
78
79
80void _elm_scroller_elm_interface_scrollable_policy_set(Eo *obj, Elm_Scroller_Data *pd, Elm_Scroller_Policy hbar, Elm_Scroller_Policy vbar);
81
82
83void _elm_scroller_elm_interface_scrollable_single_direction_set(Eo *obj, Elm_Scroller_Data *pd, Elm_Scroller_Single_Direction single_dir);
84
85
86Elm_Scroller_Single_Direction _elm_scroller_elm_interface_scrollable_single_direction_get(const Eo *obj, Elm_Scroller_Data *pd);
87
88
89const Efl_Access_Action_Data *_elm_scroller_efl_access_widget_action_elm_actions_get(const Eo *obj, Elm_Scroller_Data *pd);
90
91
92Efl_Object *_elm_scroller_efl_part_part_get(const Eo *obj, Elm_Scroller_Data *pd, const char *name);
93
94
95Eina_Bool _elm_scroller_efl_ui_widget_focus_state_apply(Eo *obj, Elm_Scroller_Data *pd, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Efl_Ui_Widget *redirect);
96
97
98static Eina_Bool
99_elm_scroller_class_initializer(Efl_Class *klass)
100{
101 const Efl_Object_Ops *opsp = NULL;
102
103 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
104
105#ifndef ELM_SCROLLER_EXTRA_OPS
106#define ELM_SCROLLER_EXTRA_OPS
107#endif
108
109 EFL_OPS_DEFINE(ops,
110 EFL_OBJECT_OP_FUNC(elm_obj_scroller_custom_widget_base_theme_set, _elm_scroller_custom_widget_base_theme_set),
111 EFL_OBJECT_OP_FUNC(elm_obj_scroller_page_scroll_limit_set, _elm_scroller_page_scroll_limit_set),
112 EFL_OBJECT_OP_FUNC(elm_obj_scroller_page_scroll_limit_get, _elm_scroller_page_scroll_limit_get),
113 EFL_OBJECT_OP_FUNC(efl_constructor, _elm_scroller_efl_object_constructor),
114 EFL_OBJECT_OP_FUNC(efl_gfx_entity_position_set, _elm_scroller_efl_gfx_entity_position_set),
115 EFL_OBJECT_OP_FUNC(efl_gfx_entity_size_set, _elm_scroller_efl_gfx_entity_size_set),
116 EFL_OBJECT_OP_FUNC(efl_canvas_group_member_add, _elm_scroller_efl_canvas_group_group_member_add),
117 EFL_OBJECT_OP_FUNC(efl_content_set, _elm_scroller_efl_content_content_set),
118 EFL_OBJECT_OP_FUNC(efl_content_get, _elm_scroller_efl_content_content_get),
119 EFL_OBJECT_OP_FUNC(efl_content_unset, _elm_scroller_efl_content_content_unset),
120 EFL_OBJECT_OP_FUNC(efl_ui_widget_theme_apply, _elm_scroller_efl_ui_widget_theme_apply),
121 EFL_OBJECT_OP_FUNC(efl_ui_widget_on_access_activate, _elm_scroller_efl_ui_widget_on_access_activate),
122 EFL_OBJECT_OP_FUNC(efl_ui_widget_sub_object_del, _elm_scroller_efl_ui_widget_widget_sub_object_del),
123 EFL_OBJECT_OP_FUNC(efl_ui_widget_input_event_handler, _elm_scroller_efl_ui_widget_widget_input_event_handler),
124 EFL_OBJECT_OP_FUNC(elm_interface_scrollable_page_size_set, _elm_scroller_elm_interface_scrollable_page_size_set),
125 EFL_OBJECT_OP_FUNC(elm_interface_scrollable_policy_set, _elm_scroller_elm_interface_scrollable_policy_set),
126 EFL_OBJECT_OP_FUNC(elm_interface_scrollable_single_direction_set, _elm_scroller_elm_interface_scrollable_single_direction_set),
127 EFL_OBJECT_OP_FUNC(elm_interface_scrollable_single_direction_get, _elm_scroller_elm_interface_scrollable_single_direction_get),
128 EFL_OBJECT_OP_FUNC(efl_access_widget_action_elm_actions_get, _elm_scroller_efl_access_widget_action_elm_actions_get),
129 EFL_OBJECT_OP_FUNC(efl_part_get, _elm_scroller_efl_part_part_get),
130 EFL_OBJECT_OP_FUNC(efl_ui_widget_focus_state_apply, _elm_scroller_efl_ui_widget_focus_state_apply),
131 ELM_SCROLLER_EXTRA_OPS
132 );
133 opsp = &ops;
134
135 return efl_class_functions_set(klass, opsp, ropsp);
136}
137
138static const Efl_Class_Description _elm_scroller_class_desc = {
139 EO_VERSION,
140 "Elm.Scroller",
141 EFL_CLASS_TYPE_REGULAR,
142 sizeof(Elm_Scroller_Data),
143 _elm_scroller_class_initializer,
144 _elm_scroller_class_constructor,
145 NULL
146};
147
148EFL_DEFINE_CLASS(elm_scroller_class_get, &_elm_scroller_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_SCROLLABLE_INTERFACE, EFL_CONTENT_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
149
150#include "elm_scroller_eo.legacy.c"
diff --git a/src/lib/elementary/elm_scroller_eo.h b/src/lib/elementary/elm_scroller_eo.h
new file mode 100644
index 0000000..6d4dd6c
--- /dev/null
+++ b/src/lib/elementary/elm_scroller_eo.h
@@ -0,0 +1,183 @@
1#ifndef _ELM_SCROLLER_EO_H_
2#define _ELM_SCROLLER_EO_H_
3
4#ifndef _ELM_SCROLLER_EO_CLASS_TYPE
5#define _ELM_SCROLLER_EO_CLASS_TYPE
6
7typedef Eo Elm_Scroller;
8
9#endif
10
11#ifndef _ELM_SCROLLER_EO_TYPES
12#define _ELM_SCROLLER_EO_TYPES
13
14
15#endif
16/** Elementary scroller class
17 *
18 * @ingroup Elm_Scroller
19 */
20#define ELM_SCROLLER_CLASS elm_scroller_class_get()
21
22EWAPI const Efl_Class *elm_scroller_class_get(void);
23
24/**
25 * @brief Set custom theme elements for the scroller
26 *
27 * @param[in] obj The object.
28 * @param[in] klass Klass name
29 * @param[in] group Group name
30 *
31 * @ingroup Elm_Scroller
32 */
33EOAPI void elm_obj_scroller_custom_widget_base_theme_set(Eo *obj, const char *klass, const char *group);
34
35/**
36 * @brief Set the maximum of the movable page at a flicking.
37 *
38 * The value of maximum movable page should be more than 1.
39 *
40 * @param[in] obj The object.
41 * @param[in] page_limit_h The maximum of the movable horizontal page
42 * @param[in] page_limit_v The maximum of the movable vertical page
43 *
44 * @since 1.8
45 *
46 * @ingroup Elm_Scroller
47 */
48EOAPI void elm_obj_scroller_page_scroll_limit_set(const Eo *obj, int page_limit_h, int page_limit_v);
49
50/**
51 * @brief Get the maximum of the movable page at a flicking.
52 *
53 * @param[in] obj The object.
54 * @param[in] page_limit_h The maximum of the movable horizontal page
55 * @param[in] page_limit_v The maximum of the movable vertical page
56 *
57 * @since 1.8
58 *
59 * @ingroup Elm_Scroller
60 */
61EOAPI void elm_obj_scroller_page_scroll_limit_get(const Eo *obj, int *page_limit_h, int *page_limit_v);
62
63EWAPI extern const Efl_Event_Description _ELM_SCROLLER_EVENT_SCROLL_PAGE_CHANGED;
64
65/** Called when scroll page changed
66 *
67 * @ingroup Elm_Scroller
68 */
69#define ELM_SCROLLER_EVENT_SCROLL_PAGE_CHANGED (&(_ELM_SCROLLER_EVENT_SCROLL_PAGE_CHANGED))
70
71EWAPI extern const Efl_Event_Description _ELM_SCROLLER_EVENT_HBAR_UNPRESS;
72
73/** Called when horizontal bar is no longer pressed
74 *
75 * @ingroup Elm_Scroller
76 */
77#define ELM_SCROLLER_EVENT_HBAR_UNPRESS (&(_ELM_SCROLLER_EVENT_HBAR_UNPRESS))
78
79EWAPI extern const Efl_Event_Description _ELM_SCROLLER_EVENT_HBAR_PRESS;
80
81/** Called when horizontal bar is pressed
82 *
83 * @ingroup Elm_Scroller
84 */
85#define ELM_SCROLLER_EVENT_HBAR_PRESS (&(_ELM_SCROLLER_EVENT_HBAR_PRESS))
86
87EWAPI extern const Efl_Event_Description _ELM_SCROLLER_EVENT_HBAR_DRAG;
88
89/** Called when horizontal bar is dragged
90 *
91 * @ingroup Elm_Scroller
92 */
93#define ELM_SCROLLER_EVENT_HBAR_DRAG (&(_ELM_SCROLLER_EVENT_HBAR_DRAG))
94
95EWAPI extern const Efl_Event_Description _ELM_SCROLLER_EVENT_VBAR_UNPRESS;
96
97/** Called when vertical bar is no longer pressed
98 *
99 * @ingroup Elm_Scroller
100 */
101#define ELM_SCROLLER_EVENT_VBAR_UNPRESS (&(_ELM_SCROLLER_EVENT_VBAR_UNPRESS))
102
103EWAPI extern const Efl_Event_Description _ELM_SCROLLER_EVENT_VBAR_PRESS;
104
105/** Called when vertical bar is pressed
106 *
107 * @ingroup Elm_Scroller
108 */
109#define ELM_SCROLLER_EVENT_VBAR_PRESS (&(_ELM_SCROLLER_EVENT_VBAR_PRESS))
110
111EWAPI extern const Efl_Event_Description _ELM_SCROLLER_EVENT_VBAR_DRAG;
112
113/** Called when vertical bar is dragged
114 *
115 * @ingroup Elm_Scroller
116 */
117#define ELM_SCROLLER_EVENT_VBAR_DRAG (&(_ELM_SCROLLER_EVENT_VBAR_DRAG))
118
119EWAPI extern const Efl_Event_Description _ELM_SCROLLER_EVENT_SCROLL_LEFT;
120
121/** Called when scrolling to left
122 *
123 * @ingroup Elm_Scroller
124 */
125#define ELM_SCROLLER_EVENT_SCROLL_LEFT (&(_ELM_SCROLLER_EVENT_SCROLL_LEFT))
126
127EWAPI extern const Efl_Event_Description _ELM_SCROLLER_EVENT_SCROLL_RIGHT;
128
129/** Called when scrolling to right
130 *
131 * @ingroup Elm_Scroller
132 */
133#define ELM_SCROLLER_EVENT_SCROLL_RIGHT (&(_ELM_SCROLLER_EVENT_SCROLL_RIGHT))
134
135EWAPI extern const Efl_Event_Description _ELM_SCROLLER_EVENT_SCROLL_UP;
136
137/** Called scrolled upwards
138 *
139 * @ingroup Elm_Scroller
140 */
141#define ELM_SCROLLER_EVENT_SCROLL_UP (&(_ELM_SCROLLER_EVENT_SCROLL_UP))
142
143EWAPI extern const Efl_Event_Description _ELM_SCROLLER_EVENT_SCROLL_DOWN;
144
145/** Called when scrolled downwards
146 *
147 * @ingroup Elm_Scroller
148 */
149#define ELM_SCROLLER_EVENT_SCROLL_DOWN (&(_ELM_SCROLLER_EVENT_SCROLL_DOWN))
150
151EWAPI extern const Efl_Event_Description _ELM_SCROLLER_EVENT_EDGE_LEFT;
152
153/** Called when hitting the left edge
154 *
155 * @ingroup Elm_Scroller
156 */
157#define ELM_SCROLLER_EVENT_EDGE_LEFT (&(_ELM_SCROLLER_EVENT_EDGE_LEFT))
158
159EWAPI extern const Efl_Event_Description _ELM_SCROLLER_EVENT_EDGE_RIGHT;
160
161/** Called when hitting the right edge
162 *
163 * @ingroup Elm_Scroller
164 */
165#define ELM_SCROLLER_EVENT_EDGE_RIGHT (&(_ELM_SCROLLER_EVENT_EDGE_RIGHT))
166
167EWAPI extern const Efl_Event_Description _ELM_SCROLLER_EVENT_EDGE_TOP;
168
169/** Called when hitting the top edge
170 *
171 * @ingroup Elm_Scroller
172 */
173#define ELM_SCROLLER_EVENT_EDGE_TOP (&(_ELM_SCROLLER_EVENT_EDGE_TOP))
174
175EWAPI extern const Efl_Event_Description _ELM_SCROLLER_EVENT_EDGE_BOTTOM;
176
177/** Called when hitting the bottom edge
178 *
179 * @ingroup Elm_Scroller
180 */
181#define ELM_SCROLLER_EVENT_EDGE_BOTTOM (&(_ELM_SCROLLER_EVENT_EDGE_BOTTOM))
182
183#endif
diff --git a/src/lib/elementary/elm_scroller_eo.legacy.c b/src/lib/elementary/elm_scroller_eo.legacy.c
new file mode 100644
index 0000000..829d5de
--- /dev/null
+++ b/src/lib/elementary/elm_scroller_eo.legacy.c
@@ -0,0 +1,18 @@
1
2EAPI void
3elm_scroller_custom_widget_base_theme_set(Elm_Scroller *obj, const char *klass, const char *group)
4{
5 elm_obj_scroller_custom_widget_base_theme_set(obj, klass, group);
6}
7
8EAPI void
9elm_scroller_page_scroll_limit_set(const Elm_Scroller *obj, int page_limit_h, int page_limit_v)
10{
11 elm_obj_scroller_page_scroll_limit_set(obj, page_limit_h, page_limit_v);
12}
13
14EAPI void
15elm_scroller_page_scroll_limit_get(const Elm_Scroller *obj, int *page_limit_h, int *page_limit_v)
16{
17 elm_obj_scroller_page_scroll_limit_get(obj, page_limit_h, page_limit_v);
18}
diff --git a/src/lib/elementary/elm_scroller_eo.legacy.h b/src/lib/elementary/elm_scroller_eo.legacy.h
new file mode 100644
index 0000000..04dba34
--- /dev/null
+++ b/src/lib/elementary/elm_scroller_eo.legacy.h
@@ -0,0 +1,56 @@
1#ifndef _ELM_SCROLLER_EO_LEGACY_H_
2#define _ELM_SCROLLER_EO_LEGACY_H_
3
4#ifndef _ELM_SCROLLER_EO_CLASS_TYPE
5#define _ELM_SCROLLER_EO_CLASS_TYPE
6
7typedef Eo Elm_Scroller;
8
9#endif
10
11#ifndef _ELM_SCROLLER_EO_TYPES
12#define _ELM_SCROLLER_EO_TYPES
13
14
15#endif
16
17/**
18 * @brief Set custom theme elements for the scroller
19 *
20 * @param[in] obj The object.
21 * @param[in] klass Klass name
22 * @param[in] group Group name
23 *
24 * @ingroup Elm_Scroller_Group
25 */
26EAPI void elm_scroller_custom_widget_base_theme_set(Elm_Scroller *obj, const char *klass, const char *group);
27
28/**
29 * @brief Set the maximum of the movable page at a flicking.
30 *
31 * The value of maximum movable page should be more than 1.
32 *
33 * @param[in] obj The object.
34 * @param[in] page_limit_h The maximum of the movable horizontal page
35 * @param[in] page_limit_v The maximum of the movable vertical page
36 *
37 * @since 1.8
38 *
39 * @ingroup Elm_Scroller_Group
40 */
41EAPI void elm_scroller_page_scroll_limit_set(const Elm_Scroller *obj, int page_limit_h, int page_limit_v);
42
43/**
44 * @brief Get the maximum of the movable page at a flicking.
45 *
46 * @param[in] obj The object.
47 * @param[in] page_limit_h The maximum of the movable horizontal page
48 * @param[in] page_limit_v The maximum of the movable vertical page
49 *
50 * @since 1.8
51 *
52 * @ingroup Elm_Scroller_Group
53 */
54EAPI void elm_scroller_page_scroll_limit_get(const Elm_Scroller *obj, int *page_limit_h, int *page_limit_v);
55
56#endif
diff --git a/src/lib/elementary/elm_scroller_legacy.h b/src/lib/elementary/elm_scroller_legacy.h
index 884967c..6b40eff 100644
--- a/src/lib/elementary/elm_scroller_legacy.h
+++ b/src/lib/elementary/elm_scroller_legacy.h
@@ -1,5 +1,5 @@
1#include "elm_interface_scrollable.eo.legacy.h" 1#include "elm_interface_scrollable.eo.legacy.h"
2#include "elm_scroller.eo.legacy.h" 2#include "elm_scroller_eo.legacy.h"
3 3
4/** 4/**
5 * Type that blocks the scroll movement in one or more direction. 5 * Type that blocks the scroll movement in one or more direction.
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 09a9bd6..4471d9e 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -1,6 +1,5 @@
1pub_legacy_eo_files = [ 1pub_legacy_eo_files = [
2 'efl_ui_clock_legacy.eo', 2 'efl_ui_clock_legacy.eo',
3 'elm_scroller.eo',
4 'elm_sys_notify_interface.eo', 3 'elm_sys_notify_interface.eo',
5 'elm_sys_notify.eo', 4 'elm_sys_notify.eo',
6 'elm_sys_notify_dbus.eo', 5 'elm_sys_notify_dbus.eo',
@@ -787,6 +786,8 @@ elementary_pub_headers = [
787 'elm_prefs_eo.legacy.h', 786 'elm_prefs_eo.legacy.h',
788 'elm_route_eo.h', 787 'elm_route_eo.h',
789 'elm_route_eo.legacy.h', 788 'elm_route_eo.legacy.h',
789 'elm_scroller_eo.h',
790 'elm_scroller_eo.legacy.h',
790] 791]
791 792
792elementary_header_src = [ 793elementary_header_src = [