summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile_Elementary.am5
-rw-r--r--src/lib/elementary/elm_route.c2
-rw-r--r--src/lib/elementary/elm_route.eo47
-rw-r--r--src/lib/elementary/elm_route_eo.c56
-rw-r--r--src/lib/elementary/elm_route_eo.h60
-rw-r--r--src/lib/elementary/elm_route_eo.legacy.c18
-rw-r--r--src/lib/elementary/elm_route_eo.legacy.h53
-rw-r--r--src/lib/elementary/elm_route_legacy.h2
-rw-r--r--src/lib/elementary/elm_widget_route.h2
-rw-r--r--src/lib/elementary/meson.build3
10 files changed, 196 insertions, 52 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 3bca800..66c5077 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_route.eo \
187 lib/elementary/elm_scroller.eo \ 186 lib/elementary/elm_scroller.eo \
188 lib/elementary/elm_sys_notify_interface.eo \ 187 lib/elementary/elm_sys_notify_interface.eo \
189 lib/elementary/elm_sys_notify.eo \ 188 lib/elementary/elm_sys_notify.eo \
@@ -380,6 +379,8 @@ lib/elementary/elm_popup_eo.legacy.c \
380lib/elementary/elm_popup_item_eo.c \ 379lib/elementary/elm_popup_item_eo.c \
381lib/elementary/elm_prefs_eo.c \ 380lib/elementary/elm_prefs_eo.c \
382lib/elementary/elm_prefs_eo.legacy.c \ 381lib/elementary/elm_prefs_eo.legacy.c \
382lib/elementary/elm_route_eo.c \
383lib/elementary/elm_route_eo.legacy.c \
383$(NULL) 384$(NULL)
384 385
385elm_legacy_eo_headers = \ 386elm_legacy_eo_headers = \
@@ -551,6 +552,8 @@ lib/elementary/elm_popup_item_eo.h \
551lib/elementary/elm_popup_item_eo.legacy.h \ 552lib/elementary/elm_popup_item_eo.legacy.h \
552lib/elementary/elm_prefs_eo.h \ 553lib/elementary/elm_prefs_eo.h \
553lib/elementary/elm_prefs_eo.legacy.h \ 554lib/elementary/elm_prefs_eo.legacy.h \
555lib/elementary/elm_route_eo.h \
556lib/elementary/elm_route_eo.legacy.h \
554$(NULL) 557$(NULL)
555 558
556 559
diff --git a/src/lib/elementary/elm_route.c b/src/lib/elementary/elm_route.c
index 6b52ef1..3b9d3ec 100644
--- a/src/lib/elementary/elm_route.c
+++ b/src/lib/elementary/elm_route.c
@@ -265,4 +265,4 @@ _elm_route_class_constructor(Efl_Class *klass)
265#define ELM_ROUTE_EXTRA_OPS \ 265#define ELM_ROUTE_EXTRA_OPS \
266 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_route) 266 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_route)
267 267
268#include "elm_route.eo.c" 268#include "elm_route_eo.c"
diff --git a/src/lib/elementary/elm_route.eo b/src/lib/elementary/elm_route.eo
deleted file mode 100644
index 0df51d4..0000000
--- a/src/lib/elementary/elm_route.eo
+++ /dev/null
@@ -1,47 +0,0 @@
1class Elm.Route extends Efl.Ui.Widget implements Efl.Ui.Legacy
2{
3 [[Elementary route class]]
4 legacy_prefix: elm_route;
5 eo_prefix: elm_obj_route;
6 methods {
7 @property emap {
8 set {
9 [[Set map widget for this route]]
10 }
11 values {
12 emap: void_ptr; [[Elementary map widget]]
13 }
14 }
15 @property longitude_min_max {
16 get {
17 [[Get the minimum and maximum values along the longitude.
18
19 Note: If only one value is needed, the other pointer can be
20 passed as null.
21 ]]
22 }
23 values {
24 min: double; [[Pointer to store the minimum value.]]
25 max: double; [[Pointer to store the maximum value.]]
26 }
27 }
28 @property latitude_min_max {
29 get {
30 [[Get the minimum and maximum values along the latitude.
31
32 Note: If only one value is needed, the other pointer can be
33 passed as null.
34 ]]
35 }
36 values {
37 min: double; [[Pointer to store the minimum value.]]
38 max: double; [[Pointer to store the maximum value.]]
39 }
40 }
41 }
42 implements {
43 class.constructor;
44 Efl.Object.constructor;
45 Efl.Ui.Widget.theme_apply;
46 }
47}
diff --git a/src/lib/elementary/elm_route_eo.c b/src/lib/elementary/elm_route_eo.c
new file mode 100644
index 0000000..930eacd
--- /dev/null
+++ b/src/lib/elementary/elm_route_eo.c
@@ -0,0 +1,56 @@
1
2void _elm_route_emap_set(Eo *obj, Elm_Route_Data *pd, void *emap);
3
4EOAPI EFL_VOID_FUNC_BODYV(elm_obj_route_emap_set, EFL_FUNC_CALL(emap), void *emap);
5
6void _elm_route_longitude_min_max_get(const Eo *obj, Elm_Route_Data *pd, double *min, double *max);
7
8EOAPI EFL_VOID_FUNC_BODYV_CONST(elm_obj_route_longitude_min_max_get, EFL_FUNC_CALL(min, max), double *min, double *max);
9
10void _elm_route_latitude_min_max_get(const Eo *obj, Elm_Route_Data *pd, double *min, double *max);
11
12EOAPI EFL_VOID_FUNC_BODYV_CONST(elm_obj_route_latitude_min_max_get, EFL_FUNC_CALL(min, max), double *min, double *max);
13
14Efl_Object *_elm_route_efl_object_constructor(Eo *obj, Elm_Route_Data *pd);
15
16
17Eina_Error _elm_route_efl_ui_widget_theme_apply(Eo *obj, Elm_Route_Data *pd);
18
19
20static Eina_Bool
21_elm_route_class_initializer(Efl_Class *klass)
22{
23 const Efl_Object_Ops *opsp = NULL;
24
25 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
26
27#ifndef ELM_ROUTE_EXTRA_OPS
28#define ELM_ROUTE_EXTRA_OPS
29#endif
30
31 EFL_OPS_DEFINE(ops,
32 EFL_OBJECT_OP_FUNC(elm_obj_route_emap_set, _elm_route_emap_set),
33 EFL_OBJECT_OP_FUNC(elm_obj_route_longitude_min_max_get, _elm_route_longitude_min_max_get),
34 EFL_OBJECT_OP_FUNC(elm_obj_route_latitude_min_max_get, _elm_route_latitude_min_max_get),
35 EFL_OBJECT_OP_FUNC(efl_constructor, _elm_route_efl_object_constructor),
36 EFL_OBJECT_OP_FUNC(efl_ui_widget_theme_apply, _elm_route_efl_ui_widget_theme_apply),
37 ELM_ROUTE_EXTRA_OPS
38 );
39 opsp = &ops;
40
41 return efl_class_functions_set(klass, opsp, ropsp);
42}
43
44static const Efl_Class_Description _elm_route_class_desc = {
45 EO_VERSION,
46 "Elm.Route",
47 EFL_CLASS_TYPE_REGULAR,
48 sizeof(Elm_Route_Data),
49 _elm_route_class_initializer,
50 _elm_route_class_constructor,
51 NULL
52};
53
54EFL_DEFINE_CLASS(elm_route_class_get, &_elm_route_class_desc, EFL_UI_WIDGET_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);
55
56#include "elm_route_eo.legacy.c"
diff --git a/src/lib/elementary/elm_route_eo.h b/src/lib/elementary/elm_route_eo.h
new file mode 100644
index 0000000..a194623
--- /dev/null
+++ b/src/lib/elementary/elm_route_eo.h
@@ -0,0 +1,60 @@
1#ifndef _ELM_ROUTE_EO_H_
2#define _ELM_ROUTE_EO_H_
3
4#ifndef _ELM_ROUTE_EO_CLASS_TYPE
5#define _ELM_ROUTE_EO_CLASS_TYPE
6
7typedef Eo Elm_Route;
8
9#endif
10
11#ifndef _ELM_ROUTE_EO_TYPES
12#define _ELM_ROUTE_EO_TYPES
13
14
15#endif
16/** Elementary route class
17 *
18 * @ingroup Elm_Route
19 */
20#define ELM_ROUTE_CLASS elm_route_class_get()
21
22EWAPI const Efl_Class *elm_route_class_get(void);
23
24/**
25 * @brief Set map widget for this route
26 *
27 * @param[in] obj The object.
28 * @param[in] emap Elementary map widget
29 *
30 * @ingroup Elm_Route
31 */
32EOAPI void elm_obj_route_emap_set(Eo *obj, void *emap);
33
34/**
35 * @brief Get the minimum and maximum values along the longitude.
36 *
37 * @note If only one value is needed, the other pointer can be passed as null.
38 *
39 * @param[in] obj The object.
40 * @param[out] min Pointer to store the minimum value.
41 * @param[out] max Pointer to store the maximum value.
42 *
43 * @ingroup Elm_Route
44 */
45EOAPI void elm_obj_route_longitude_min_max_get(const Eo *obj, double *min, double *max);
46
47/**
48 * @brief Get the minimum and maximum values along the latitude.
49 *
50 * @note If only one value is needed, the other pointer can be passed as null.
51 *
52 * @param[in] obj The object.
53 * @param[out] min Pointer to store the minimum value.
54 * @param[out] max Pointer to store the maximum value.
55 *
56 * @ingroup Elm_Route
57 */
58EOAPI void elm_obj_route_latitude_min_max_get(const Eo *obj, double *min, double *max);
59
60#endif
diff --git a/src/lib/elementary/elm_route_eo.legacy.c b/src/lib/elementary/elm_route_eo.legacy.c
new file mode 100644
index 0000000..69d8a8b
--- /dev/null
+++ b/src/lib/elementary/elm_route_eo.legacy.c
@@ -0,0 +1,18 @@
1
2EAPI void
3elm_route_emap_set(Elm_Route *obj, void *emap)
4{
5 elm_obj_route_emap_set(obj, emap);
6}
7
8EAPI void
9elm_route_longitude_min_max_get(const Elm_Route *obj, double *min, double *max)
10{
11 elm_obj_route_longitude_min_max_get(obj, min, max);
12}
13
14EAPI void
15elm_route_latitude_min_max_get(const Elm_Route *obj, double *min, double *max)
16{
17 elm_obj_route_latitude_min_max_get(obj, min, max);
18}
diff --git a/src/lib/elementary/elm_route_eo.legacy.h b/src/lib/elementary/elm_route_eo.legacy.h
new file mode 100644
index 0000000..34650bd
--- /dev/null
+++ b/src/lib/elementary/elm_route_eo.legacy.h
@@ -0,0 +1,53 @@
1#ifndef _ELM_ROUTE_EO_LEGACY_H_
2#define _ELM_ROUTE_EO_LEGACY_H_
3
4#ifndef _ELM_ROUTE_EO_CLASS_TYPE
5#define _ELM_ROUTE_EO_CLASS_TYPE
6
7typedef Eo Elm_Route;
8
9#endif
10
11#ifndef _ELM_ROUTE_EO_TYPES
12#define _ELM_ROUTE_EO_TYPES
13
14
15#endif
16
17/**
18 * @brief Set map widget for this route
19 *
20 * @param[in] obj The object.
21 * @param[in] emap Elementary map widget
22 *
23 * @ingroup Elm_Route_Group
24 */
25EAPI void elm_route_emap_set(Elm_Route *obj, void *emap);
26
27/**
28 * @brief Get the minimum and maximum values along the longitude.
29 *
30 * @note If only one value is needed, the other pointer can be passed as null.
31 *
32 * @param[in] obj The object.
33 * @param[out] min Pointer to store the minimum value.
34 * @param[out] max Pointer to store the maximum value.
35 *
36 * @ingroup Elm_Route_Group
37 */
38EAPI void elm_route_longitude_min_max_get(const Elm_Route *obj, double *min, double *max);
39
40/**
41 * @brief Get the minimum and maximum values along the latitude.
42 *
43 * @note If only one value is needed, the other pointer can be passed as null.
44 *
45 * @param[in] obj The object.
46 * @param[out] min Pointer to store the minimum value.
47 * @param[out] max Pointer to store the maximum value.
48 *
49 * @ingroup Elm_Route_Group
50 */
51EAPI void elm_route_latitude_min_max_get(const Elm_Route *obj, double *min, double *max);
52
53#endif
diff --git a/src/lib/elementary/elm_route_legacy.h b/src/lib/elementary/elm_route_legacy.h
index ad320dc..7326024 100644
--- a/src/lib/elementary/elm_route_legacy.h
+++ b/src/lib/elementary/elm_route_legacy.h
@@ -8,4 +8,4 @@
8 */ 8 */
9EAPI Evas_Object *elm_route_add(Evas_Object *parent); 9EAPI Evas_Object *elm_route_add(Evas_Object *parent);
10 10
11#include "elm_route.eo.legacy.h" \ No newline at end of file 11#include "elm_route_eo.legacy.h" \ No newline at end of file
diff --git a/src/lib/elementary/elm_widget_route.h b/src/lib/elementary/elm_widget_route.h
index 6c6286b..651c67f 100644
--- a/src/lib/elementary/elm_widget_route.h
+++ b/src/lib/elementary/elm_widget_route.h
@@ -1,7 +1,7 @@
1#ifndef ELM_WIDGET_ROUTE_H 1#ifndef ELM_WIDGET_ROUTE_H
2#define ELM_WIDGET_ROUTE_H 2#define ELM_WIDGET_ROUTE_H
3 3
4#include "elm_route.eo.h" 4#include "elm_route_eo.h"
5 5
6/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR 6/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
7 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT 7 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 194804b..09a9bd6 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_route.eo',
4 'elm_scroller.eo', 3 'elm_scroller.eo',
5 'elm_sys_notify_interface.eo', 4 'elm_sys_notify_interface.eo',
6 'elm_sys_notify.eo', 5 'elm_sys_notify.eo',
@@ -786,6 +785,8 @@ elementary_pub_headers = [
786 'elm_popup_item_eo.legacy.h', 785 'elm_popup_item_eo.legacy.h',
787 'elm_prefs_eo.h', 786 'elm_prefs_eo.h',
788 'elm_prefs_eo.legacy.h', 787 'elm_prefs_eo.legacy.h',
788 'elm_route_eo.h',
789 'elm_route_eo.legacy.h',
789] 790]
790 791
791elementary_header_src = [ 792elementary_header_src = [