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:15:54 -0800
commitff173f8408ea731695374e1fb9a0ad1d8407f79e (patch)
tree285e83127d4255ddefa7ac8ec1636de8fab7b9d0
parent095b8bebc825641253fd9ec62b5084a847b4c553 (diff)
elm_notify: 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/D8187
-rw-r--r--src/Makefile_Elementary.am5
-rw-r--r--src/bin/elementary/test_win_plug.c2
-rw-r--r--src/lib/elementary/elm_notify.c2
-rw-r--r--src/lib/elementary/elm_notify.eo98
-rw-r--r--src/lib/elementary/elm_notify_eo.c179
-rw-r--r--src/lib/elementary/elm_notify_eo.h145
-rw-r--r--src/lib/elementary/elm_notify_eo.legacy.c42
-rw-r--r--src/lib/elementary/elm_notify_eo.legacy.h114
-rw-r--r--src/lib/elementary/elm_notify_legacy.h2
-rw-r--r--src/lib/elementary/elm_widget_notify.h2
-rw-r--r--src/lib/elementary/elm_widget_popup.h2
-rw-r--r--src/lib/elementary/meson.build3
12 files changed, 491 insertions, 105 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 7ceb4b1..9c5f68b 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -184,7 +184,6 @@ elm_private_eolian_files = \
184# Legacy classes - not part of public EO API 184# Legacy classes - not part of public EO API
185elm_legacy_eolian_files = \ 185elm_legacy_eolian_files = \
186 lib/elementary/efl_ui_clock_legacy.eo \ 186 lib/elementary/efl_ui_clock_legacy.eo \
187 lib/elementary/elm_notify.eo \
188 lib/elementary/elm_panel.eo \ 187 lib/elementary/elm_panel.eo \
189 lib/elementary/elm_player.eo \ 188 lib/elementary/elm_player.eo \
190 lib/elementary/elm_plug.eo \ 189 lib/elementary/elm_plug.eo \
@@ -374,6 +373,8 @@ lib/elementary/elm_naviframe_eo.c \
374lib/elementary/elm_naviframe_eo.legacy.c \ 373lib/elementary/elm_naviframe_eo.legacy.c \
375lib/elementary/elm_naviframe_item_eo.c \ 374lib/elementary/elm_naviframe_item_eo.c \
376lib/elementary/elm_naviframe_item_eo.legacy.c \ 375lib/elementary/elm_naviframe_item_eo.legacy.c \
376lib/elementary/elm_notify_eo.c \
377lib/elementary/elm_notify_eo.legacy.c \
377$(NULL) 378$(NULL)
378 379
379elm_legacy_eo_headers = \ 380elm_legacy_eo_headers = \
@@ -527,6 +528,8 @@ lib/elementary/elm_naviframe_eo.h \
527lib/elementary/elm_naviframe_eo.legacy.h \ 528lib/elementary/elm_naviframe_eo.legacy.h \
528lib/elementary/elm_naviframe_item_eo.h \ 529lib/elementary/elm_naviframe_item_eo.h \
529lib/elementary/elm_naviframe_item_eo.legacy.h \ 530lib/elementary/elm_naviframe_item_eo.legacy.h \
531lib/elementary/elm_notify_eo.h \
532lib/elementary/elm_notify_eo.legacy.h \
530$(NULL) 533$(NULL)
531 534
532 535
diff --git a/src/bin/elementary/test_win_plug.c b/src/bin/elementary/test_win_plug.c
index 867e5c4..615e6fa 100644
--- a/src/bin/elementary/test_win_plug.c
+++ b/src/bin/elementary/test_win_plug.c
@@ -4,7 +4,7 @@
4 4
5#include <Elementary.h> 5#include <Elementary.h>
6// FIXME: use smart cb 6// FIXME: use smart cb
7#include "elm_notify.eo.h" 7#include "elm_notify_eo.h"
8 8
9#define MAX_TRY 40 9#define MAX_TRY 40
10 10
diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c
index e107227..f5e9122 100644
--- a/src/lib/elementary/elm_notify.c
+++ b/src/lib/elementary/elm_notify.c
@@ -735,4 +735,4 @@ _elm_notify_part_efl_ui_l10n_l10n_text_set(Eo *obj, void *_pd EINA_UNUSED, const
735 ELM_PART_CONTENT_DEFAULT_OPS(elm_notify), \ 735 ELM_PART_CONTENT_DEFAULT_OPS(elm_notify), \
736 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_notify) 736 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_notify)
737 737
738#include "elm_notify.eo.c" 738#include "elm_notify_eo.c"
diff --git a/src/lib/elementary/elm_notify.eo b/src/lib/elementary/elm_notify.eo
deleted file mode 100644
index 04d1263..0000000
--- a/src/lib/elementary/elm_notify.eo
+++ /dev/null
@@ -1,98 +0,0 @@
1class Elm.Notify extends Efl.Ui.Widget implements Efl.Ui.Focus.Layer, Efl.Content, Efl.Ui.Legacy
2{
3 [[Elementary notification class]]
4 legacy_prefix: elm_notify;
5 eo_prefix: elm_obj_notify;
6 event_prefix: elm_notify;
7 methods {
8 @property align {
9 set {
10 [[Set the alignment of the notify object
11
12 Sets the alignment in which the notify will appear in its parent.
13
14 Note: To fill the notify box in the parent area, please pass the
15 ELM_NOTIFY_ALIGN_FILL to horizontal and vertical.
16
17 @since 1.8
18 ]]
19 }
20 get {
21 [[Get the alignment of the notify object
22
23 @since 1.8
24 ]]
25 }
26 values {
27 horizontal: double; [[The horizontal alignment of the notification]]
28 vertical: double; [[The vertical alignment of the notification]]
29 }
30 }
31 @property allow_events {
32 set {
33 [[Sets whether events should be passed to by a click outside
34 its area.
35
36 When true if the user clicks outside the window the events will
37 be caught by the others widgets, else the events are blocked.
38
39 Note: The default value is true.
40 ]]
41 }
42 get {
43 [[Return true if events are allowed below the notify object.]]
44 }
45 values {
46 allow: bool; [[$true if events are allowed, $false otherwise]]
47 }
48 }
49 @property timeout {
50 set {
51 [[Set the time interval after which the notify window is going to
52 be hidden.
53
54 This function sets a timeout and starts the timer controlling
55 when the notify is hidden. Since calling evas_object_show() on
56 a notify restarts the timer controlling when the notify is
57 hidden, setting this before the notify is shown will in effect
58 mean starting the timer when the notify is shown.
59
60 Note: Set a value <= 0.0 to disable a running timer.
61
62 Note: If the value > 0.0 and the notify is previously visible,
63 the timer will be started with this value, canceling any running
64 timer.
65 ]]
66 }
67 get {
68 [[Return the timeout value (in seconds)]]
69 }
70 values {
71 timeout: double; [[The timeout in seconds]]
72 }
73 }
74 dismiss {
75 [[Dismiss a notify object.
76 @since 1.17
77 ]]
78 }
79 }
80 implements {
81 class.constructor;
82 Efl.Object.constructor;
83 Efl.Gfx.Entity.visible { set; }
84 Efl.Gfx.Entity.position { set; }
85 Efl.Gfx.Entity.size { set; }
86 Efl.Ui.Widget.widget_parent { get; set; }
87 Efl.Ui.Widget.theme_apply;
88 Efl.Ui.Widget.widget_sub_object_del;
89 Efl.Content.content { get; set; }
90 Efl.Content.content_unset;
91 Efl.Part.part_get;
92 }
93 events {
94 block,clicked: void; [[Called when block was clicked]]
95 timeout: void; [[Called when notify timed out]]
96 dismissed: void; [[Called when notify was dismissed]]
97 }
98}
diff --git a/src/lib/elementary/elm_notify_eo.c b/src/lib/elementary/elm_notify_eo.c
new file mode 100644
index 0000000..b4974fa
--- /dev/null
+++ b/src/lib/elementary/elm_notify_eo.c
@@ -0,0 +1,179 @@
1EWAPI const Efl_Event_Description _ELM_NOTIFY_EVENT_BLOCK_CLICKED =
2 EFL_EVENT_DESCRIPTION("block,clicked");
3EWAPI const Efl_Event_Description _ELM_NOTIFY_EVENT_TIMEOUT =
4 EFL_EVENT_DESCRIPTION("timeout");
5EWAPI const Efl_Event_Description _ELM_NOTIFY_EVENT_DISMISSED =
6 EFL_EVENT_DESCRIPTION("dismissed");
7
8void _elm_notify_align_set(Eo *obj, Elm_Notify_Data *pd, double horizontal, double vertical);
9
10EOAPI EFL_VOID_FUNC_BODYV(elm_obj_notify_align_set, EFL_FUNC_CALL(horizontal, vertical), double horizontal, double vertical);
11
12void _elm_notify_align_get(const Eo *obj, Elm_Notify_Data *pd, double *horizontal, double *vertical);
13
14EOAPI EFL_VOID_FUNC_BODYV_CONST(elm_obj_notify_align_get, EFL_FUNC_CALL(horizontal, vertical), double *horizontal, double *vertical);
15
16void _elm_notify_allow_events_set(Eo *obj, Elm_Notify_Data *pd, Eina_Bool allow);
17
18
19static Eina_Error
20__eolian_elm_notify_allow_events_set_reflect(Eo *obj, Eina_Value val)
21{
22 Eina_Error r = 0; Eina_Bool cval;
23 if (!eina_value_bool_convert(&val, &cval))
24 {
25 r = EINA_ERROR_VALUE_FAILED;
26 goto end;
27 }
28 elm_obj_notify_allow_events_set(obj, cval);
29 end:
30 eina_value_flush(&val);
31 return r;
32}
33
34EOAPI EFL_VOID_FUNC_BODYV(elm_obj_notify_allow_events_set, EFL_FUNC_CALL(allow), Eina_Bool allow);
35
36Eina_Bool _elm_notify_allow_events_get(const Eo *obj, Elm_Notify_Data *pd);
37
38
39static Eina_Value
40__eolian_elm_notify_allow_events_get_reflect(Eo *obj)
41{
42 Eina_Bool val = elm_obj_notify_allow_events_get(obj);
43 return eina_value_bool_init(val);
44}
45
46EOAPI EFL_FUNC_BODY_CONST(elm_obj_notify_allow_events_get, Eina_Bool, 0);
47
48void _elm_notify_timeout_set(Eo *obj, Elm_Notify_Data *pd, double timeout);
49
50
51static Eina_Error
52__eolian_elm_notify_timeout_set_reflect(Eo *obj, Eina_Value val)
53{
54 Eina_Error r = 0; double cval;
55 if (!eina_value_double_convert(&val, &cval))
56 {
57 r = EINA_ERROR_VALUE_FAILED;
58 goto end;
59 }
60 elm_obj_notify_timeout_set(obj, cval);
61 end:
62 eina_value_flush(&val);
63 return r;
64}
65
66EOAPI EFL_VOID_FUNC_BODYV(elm_obj_notify_timeout_set, EFL_FUNC_CALL(timeout), double timeout);
67
68double _elm_notify_timeout_get(const Eo *obj, Elm_Notify_Data *pd);
69
70
71static Eina_Value
72__eolian_elm_notify_timeout_get_reflect(Eo *obj)
73{
74 double val = elm_obj_notify_timeout_get(obj);
75 return eina_value_double_init(val);
76}
77
78EOAPI EFL_FUNC_BODY_CONST(elm_obj_notify_timeout_get, double, 0);
79
80void _elm_notify_dismiss(Eo *obj, Elm_Notify_Data *pd);
81
82EOAPI EFL_VOID_FUNC_BODY(elm_obj_notify_dismiss);
83
84Efl_Object *_elm_notify_efl_object_constructor(Eo *obj, Elm_Notify_Data *pd);
85
86
87void _elm_notify_efl_gfx_entity_visible_set(Eo *obj, Elm_Notify_Data *pd, Eina_Bool v);
88
89
90void _elm_notify_efl_gfx_entity_position_set(Eo *obj, Elm_Notify_Data *pd, Eina_Position2D pos);
91
92
93void _elm_notify_efl_gfx_entity_size_set(Eo *obj, Elm_Notify_Data *pd, Eina_Size2D size);
94
95
96void _elm_notify_efl_ui_widget_widget_parent_set(Eo *obj, Elm_Notify_Data *pd, Efl_Ui_Widget *parent);
97
98
99Efl_Ui_Widget *_elm_notify_efl_ui_widget_widget_parent_get(const Eo *obj, Elm_Notify_Data *pd);
100
101
102Eina_Error _elm_notify_efl_ui_widget_theme_apply(Eo *obj, Elm_Notify_Data *pd);
103
104
105Eina_Bool _elm_notify_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Notify_Data *pd, Efl_Canvas_Object *sub_obj);
106
107
108Eina_Bool _elm_notify_efl_content_content_set(Eo *obj, Elm_Notify_Data *pd, Efl_Gfx_Entity *content);
109
110
111Efl_Gfx_Entity *_elm_notify_efl_content_content_get(const Eo *obj, Elm_Notify_Data *pd);
112
113
114Efl_Gfx_Entity *_elm_notify_efl_content_content_unset(Eo *obj, Elm_Notify_Data *pd);
115
116
117Efl_Object *_elm_notify_efl_part_part_get(const Eo *obj, Elm_Notify_Data *pd, const char *name);
118
119
120static Eina_Bool
121_elm_notify_class_initializer(Efl_Class *klass)
122{
123 const Efl_Object_Ops *opsp = NULL;
124
125 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
126
127#ifndef ELM_NOTIFY_EXTRA_OPS
128#define ELM_NOTIFY_EXTRA_OPS
129#endif
130
131 EFL_OPS_DEFINE(ops,
132 EFL_OBJECT_OP_FUNC(elm_obj_notify_align_set, _elm_notify_align_set),
133 EFL_OBJECT_OP_FUNC(elm_obj_notify_align_get, _elm_notify_align_get),
134 EFL_OBJECT_OP_FUNC(elm_obj_notify_allow_events_set, _elm_notify_allow_events_set),
135 EFL_OBJECT_OP_FUNC(elm_obj_notify_allow_events_get, _elm_notify_allow_events_get),
136 EFL_OBJECT_OP_FUNC(elm_obj_notify_timeout_set, _elm_notify_timeout_set),
137 EFL_OBJECT_OP_FUNC(elm_obj_notify_timeout_get, _elm_notify_timeout_get),
138 EFL_OBJECT_OP_FUNC(elm_obj_notify_dismiss, _elm_notify_dismiss),
139 EFL_OBJECT_OP_FUNC(efl_constructor, _elm_notify_efl_object_constructor),
140 EFL_OBJECT_OP_FUNC(efl_gfx_entity_visible_set, _elm_notify_efl_gfx_entity_visible_set),
141 EFL_OBJECT_OP_FUNC(efl_gfx_entity_position_set, _elm_notify_efl_gfx_entity_position_set),
142 EFL_OBJECT_OP_FUNC(efl_gfx_entity_size_set, _elm_notify_efl_gfx_entity_size_set),
143 EFL_OBJECT_OP_FUNC(efl_ui_widget_parent_set, _elm_notify_efl_ui_widget_widget_parent_set),
144 EFL_OBJECT_OP_FUNC(efl_ui_widget_parent_get, _elm_notify_efl_ui_widget_widget_parent_get),
145 EFL_OBJECT_OP_FUNC(efl_ui_widget_theme_apply, _elm_notify_efl_ui_widget_theme_apply),
146 EFL_OBJECT_OP_FUNC(efl_ui_widget_sub_object_del, _elm_notify_efl_ui_widget_widget_sub_object_del),
147 EFL_OBJECT_OP_FUNC(efl_content_set, _elm_notify_efl_content_content_set),
148 EFL_OBJECT_OP_FUNC(efl_content_get, _elm_notify_efl_content_content_get),
149 EFL_OBJECT_OP_FUNC(efl_content_unset, _elm_notify_efl_content_content_unset),
150 EFL_OBJECT_OP_FUNC(efl_part_get, _elm_notify_efl_part_part_get),
151 ELM_NOTIFY_EXTRA_OPS
152 );
153 opsp = &ops;
154
155 static const Efl_Object_Property_Reflection refl_table[] = {
156 {"allow_events", __eolian_elm_notify_allow_events_set_reflect, __eolian_elm_notify_allow_events_get_reflect},
157 {"timeout", __eolian_elm_notify_timeout_set_reflect, __eolian_elm_notify_timeout_get_reflect},
158 };
159 static const Efl_Object_Property_Reflection_Ops rops = {
160 refl_table, EINA_C_ARRAY_LENGTH(refl_table)
161 };
162 ropsp = &rops;
163
164 return efl_class_functions_set(klass, opsp, ropsp);
165}
166
167static const Efl_Class_Description _elm_notify_class_desc = {
168 EO_VERSION,
169 "Elm.Notify",
170 EFL_CLASS_TYPE_REGULAR,
171 sizeof(Elm_Notify_Data),
172 _elm_notify_class_initializer,
173 _elm_notify_class_constructor,
174 NULL
175};
176
177EFL_DEFINE_CLASS(elm_notify_class_get, &_elm_notify_class_desc, EFL_UI_WIDGET_CLASS, EFL_UI_FOCUS_LAYER_MIXIN, EFL_CONTENT_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
178
179#include "elm_notify_eo.legacy.c"
diff --git a/src/lib/elementary/elm_notify_eo.h b/src/lib/elementary/elm_notify_eo.h
new file mode 100644
index 0000000..37b0598
--- /dev/null
+++ b/src/lib/elementary/elm_notify_eo.h
@@ -0,0 +1,145 @@
1#ifndef _ELM_NOTIFY_EO_H_
2#define _ELM_NOTIFY_EO_H_
3
4#ifndef _ELM_NOTIFY_EO_CLASS_TYPE
5#define _ELM_NOTIFY_EO_CLASS_TYPE
6
7typedef Eo Elm_Notify;
8
9#endif
10
11#ifndef _ELM_NOTIFY_EO_TYPES
12#define _ELM_NOTIFY_EO_TYPES
13
14
15#endif
16/** Elementary notification class
17 *
18 * @ingroup Elm_Notify
19 */
20#define ELM_NOTIFY_CLASS elm_notify_class_get()
21
22EWAPI const Efl_Class *elm_notify_class_get(void);
23
24/**
25 * @brief Set the alignment of the notify object
26 *
27 * Sets the alignment in which the notify will appear in its parent.
28 *
29 * @note To fill the notify box in the parent area, please pass the
30 * ELM_NOTIFY_ALIGN_FILL to horizontal and vertical.
31 *
32 * @param[in] obj The object.
33 * @param[in] horizontal The horizontal alignment of the notification
34 * @param[in] vertical The vertical alignment of the notification
35 *
36 * @since 1.8
37 *
38 * @ingroup Elm_Notify
39 */
40EOAPI void elm_obj_notify_align_set(Eo *obj, double horizontal, double vertical);
41
42/**
43 * @brief Get the alignment of the notify object
44 *
45 * @param[in] obj The object.
46 * @param[out] horizontal The horizontal alignment of the notification
47 * @param[out] vertical The vertical alignment of the notification
48 *
49 * @since 1.8
50 *
51 * @ingroup Elm_Notify
52 */
53EOAPI void elm_obj_notify_align_get(const Eo *obj, double *horizontal, double *vertical);
54
55/**
56 * @brief Sets whether events should be passed to by a click outside its area.
57 *
58 * When true if the user clicks outside the window the events will be caught by
59 * the others widgets, else the events are blocked.
60 *
61 * @note The default value is true.
62 *
63 * @param[in] obj The object.
64 * @param[in] allow @c true if events are allowed, @c false otherwise
65 *
66 * @ingroup Elm_Notify
67 */
68EOAPI void elm_obj_notify_allow_events_set(Eo *obj, Eina_Bool allow);
69
70/**
71 * @brief Return true if events are allowed below the notify object.
72 *
73 * @param[in] obj The object.
74 *
75 * @return @c true if events are allowed, @c false otherwise
76 *
77 * @ingroup Elm_Notify
78 */
79EOAPI Eina_Bool elm_obj_notify_allow_events_get(const Eo *obj);
80
81/**
82 * @brief Set the time interval after which the notify window is going to be
83 * hidden.
84 *
85 * This function sets a timeout and starts the timer controlling when the
86 * notify is hidden. Since calling evas_object_show() on a notify restarts the
87 * timer controlling when the notify is hidden, setting this before the notify
88 * is shown will in effect mean starting the timer when the notify is shown.
89 *
90 * @note Set a value <= 0.0 to disable a running timer.
91 *
92 * @note If the value > 0.0 and the notify is previously visible, the timer
93 * will be started with this value, canceling any running timer.
94 *
95 * @param[in] obj The object.
96 * @param[in] timeout The timeout in seconds
97 *
98 * @ingroup Elm_Notify
99 */
100EOAPI void elm_obj_notify_timeout_set(Eo *obj, double timeout);
101
102/**
103 * @brief Return the timeout value (in seconds)
104 *
105 * @param[in] obj The object.
106 *
107 * @return The timeout in seconds
108 *
109 * @ingroup Elm_Notify
110 */
111EOAPI double elm_obj_notify_timeout_get(const Eo *obj);
112
113/** Dismiss a notify object.
114 *
115 * @since 1.17
116 *
117 * @ingroup Elm_Notify
118 */
119EOAPI void elm_obj_notify_dismiss(Eo *obj);
120
121EWAPI extern const Efl_Event_Description _ELM_NOTIFY_EVENT_BLOCK_CLICKED;
122
123/** Called when block was clicked
124 *
125 * @ingroup Elm_Notify
126 */
127#define ELM_NOTIFY_EVENT_BLOCK_CLICKED (&(_ELM_NOTIFY_EVENT_BLOCK_CLICKED))
128
129EWAPI extern const Efl_Event_Description _ELM_NOTIFY_EVENT_TIMEOUT;
130
131/** Called when notify timed out
132 *
133 * @ingroup Elm_Notify
134 */
135#define ELM_NOTIFY_EVENT_TIMEOUT (&(_ELM_NOTIFY_EVENT_TIMEOUT))
136
137EWAPI extern const Efl_Event_Description _ELM_NOTIFY_EVENT_DISMISSED;
138
139/** Called when notify was dismissed
140 *
141 * @ingroup Elm_Notify
142 */
143#define ELM_NOTIFY_EVENT_DISMISSED (&(_ELM_NOTIFY_EVENT_DISMISSED))
144
145#endif
diff --git a/src/lib/elementary/elm_notify_eo.legacy.c b/src/lib/elementary/elm_notify_eo.legacy.c
new file mode 100644
index 0000000..9e951a9
--- /dev/null
+++ b/src/lib/elementary/elm_notify_eo.legacy.c
@@ -0,0 +1,42 @@
1
2EAPI void
3elm_notify_align_set(Elm_Notify *obj, double horizontal, double vertical)
4{
5 elm_obj_notify_align_set(obj, horizontal, vertical);
6}
7
8EAPI void
9elm_notify_align_get(const Elm_Notify *obj, double *horizontal, double *vertical)
10{
11 elm_obj_notify_align_get(obj, horizontal, vertical);
12}
13
14EAPI void
15elm_notify_allow_events_set(Elm_Notify *obj, Eina_Bool allow)
16{
17 elm_obj_notify_allow_events_set(obj, allow);
18}
19
20EAPI Eina_Bool
21elm_notify_allow_events_get(const Elm_Notify *obj)
22{
23 return elm_obj_notify_allow_events_get(obj);
24}
25
26EAPI void
27elm_notify_timeout_set(Elm_Notify *obj, double timeout)
28{
29 elm_obj_notify_timeout_set(obj, timeout);
30}
31
32EAPI double
33elm_notify_timeout_get(const Elm_Notify *obj)
34{
35 return elm_obj_notify_timeout_get(obj);
36}
37
38EAPI void
39elm_notify_dismiss(Elm_Notify *obj)
40{
41 elm_obj_notify_dismiss(obj);
42}
diff --git a/src/lib/elementary/elm_notify_eo.legacy.h b/src/lib/elementary/elm_notify_eo.legacy.h
new file mode 100644
index 0000000..05e2e7d
--- /dev/null
+++ b/src/lib/elementary/elm_notify_eo.legacy.h
@@ -0,0 +1,114 @@
1#ifndef _ELM_NOTIFY_EO_LEGACY_H_
2#define _ELM_NOTIFY_EO_LEGACY_H_
3
4#ifndef _ELM_NOTIFY_EO_CLASS_TYPE
5#define _ELM_NOTIFY_EO_CLASS_TYPE
6
7typedef Eo Elm_Notify;
8
9#endif
10
11#ifndef _ELM_NOTIFY_EO_TYPES
12#define _ELM_NOTIFY_EO_TYPES
13
14
15#endif
16
17/**
18 * @brief Set the alignment of the notify object
19 *
20 * Sets the alignment in which the notify will appear in its parent.
21 *
22 * @note To fill the notify box in the parent area, please pass the
23 * ELM_NOTIFY_ALIGN_FILL to horizontal and vertical.
24 *
25 * @param[in] obj The object.
26 * @param[in] horizontal The horizontal alignment of the notification
27 * @param[in] vertical The vertical alignment of the notification
28 *
29 * @since 1.8
30 *
31 * @ingroup Elm_Notify_Group
32 */
33EAPI void elm_notify_align_set(Elm_Notify *obj, double horizontal, double vertical);
34
35/**
36 * @brief Get the alignment of the notify object
37 *
38 * @param[in] obj The object.
39 * @param[out] horizontal The horizontal alignment of the notification
40 * @param[out] vertical The vertical alignment of the notification
41 *
42 * @since 1.8
43 *
44 * @ingroup Elm_Notify_Group
45 */
46EAPI void elm_notify_align_get(const Elm_Notify *obj, double *horizontal, double *vertical);
47
48/**
49 * @brief Sets whether events should be passed to by a click outside its area.
50 *
51 * When true if the user clicks outside the window the events will be caught by
52 * the others widgets, else the events are blocked.
53 *
54 * @note The default value is true.
55 *
56 * @param[in] obj The object.
57 * @param[in] allow @c true if events are allowed, @c false otherwise
58 *
59 * @ingroup Elm_Notify_Group
60 */
61EAPI void elm_notify_allow_events_set(Elm_Notify *obj, Eina_Bool allow);
62
63/**
64 * @brief Return true if events are allowed below the notify object.
65 *
66 * @param[in] obj The object.
67 *
68 * @return @c true if events are allowed, @c false otherwise
69 *
70 * @ingroup Elm_Notify_Group
71 */
72EAPI Eina_Bool elm_notify_allow_events_get(const Elm_Notify *obj);
73
74/**
75 * @brief Set the time interval after which the notify window is going to be
76 * hidden.
77 *
78 * This function sets a timeout and starts the timer controlling when the
79 * notify is hidden. Since calling evas_object_show() on a notify restarts the
80 * timer controlling when the notify is hidden, setting this before the notify
81 * is shown will in effect mean starting the timer when the notify is shown.
82 *
83 * @note Set a value <= 0.0 to disable a running timer.
84 *
85 * @note If the value > 0.0 and the notify is previously visible, the timer
86 * will be started with this value, canceling any running timer.
87 *
88 * @param[in] obj The object.
89 * @param[in] timeout The timeout in seconds
90 *
91 * @ingroup Elm_Notify_Group
92 */
93EAPI void elm_notify_timeout_set(Elm_Notify *obj, double timeout);
94
95/**
96 * @brief Return the timeout value (in seconds)
97 *
98 * @param[in] obj The object.
99 *
100 * @return The timeout in seconds
101 *
102 * @ingroup Elm_Notify_Group
103 */
104EAPI double elm_notify_timeout_get(const Elm_Notify *obj);
105
106/** Dismiss a notify object.
107 *
108 * @since 1.17
109 *
110 * @ingroup Elm_Notify_Group
111 */
112EAPI void elm_notify_dismiss(Elm_Notify *obj);
113
114#endif
diff --git a/src/lib/elementary/elm_notify_legacy.h b/src/lib/elementary/elm_notify_legacy.h
index e3547d7..ceb39a9 100644
--- a/src/lib/elementary/elm_notify_legacy.h
+++ b/src/lib/elementary/elm_notify_legacy.h
@@ -33,4 +33,4 @@ EAPI void elm_notify_parent_set(Evas_Object *obj, Evas_O
33 */ 33 */
34EAPI Evas_Object *elm_notify_parent_get(const Evas_Object *obj); 34EAPI Evas_Object *elm_notify_parent_get(const Evas_Object *obj);
35 35
36#include "elm_notify.eo.legacy.h" \ No newline at end of file 36#include "elm_notify_eo.legacy.h" \ No newline at end of file
diff --git a/src/lib/elementary/elm_widget_notify.h b/src/lib/elementary/elm_widget_notify.h
index 0026f19..484377b 100644
--- a/src/lib/elementary/elm_widget_notify.h
+++ b/src/lib/elementary/elm_widget_notify.h
@@ -3,7 +3,7 @@
3 3
4#include "Elementary.h" 4#include "Elementary.h"
5 5
6#include <elm_notify.eo.h> 6#include <elm_notify_eo.h>
7 7
8/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR 8/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
9 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT 9 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
diff --git a/src/lib/elementary/elm_widget_popup.h b/src/lib/elementary/elm_widget_popup.h
index a57d22f..0ede3e5 100644
--- a/src/lib/elementary/elm_widget_popup.h
+++ b/src/lib/elementary/elm_widget_popup.h
@@ -3,7 +3,7 @@
3 3
4#include "Elementary.h" 4#include "Elementary.h"
5#include "elm_widget_layout.h" 5#include "elm_widget_layout.h"
6#include "elm_notify.eo.h" 6#include "elm_notify_eo.h"
7#include "elm_popup_item.eo.h" 7#include "elm_popup_item.eo.h"
8#include "elm_popup.eo.h" 8#include "elm_popup.eo.h"
9 9
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 6437926..752c5c9 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_notify.eo',
4 'elm_panel.eo', 3 'elm_panel.eo',
5 'elm_player.eo', 4 'elm_player.eo',
6 'elm_plug.eo', 5 'elm_plug.eo',
@@ -777,6 +776,8 @@ elementary_pub_headers = [
777 'elm_naviframe_eo.legacy.h', 776 'elm_naviframe_eo.legacy.h',
778 'elm_naviframe_item_eo.h', 777 'elm_naviframe_item_eo.h',
779 'elm_naviframe_item_eo.legacy.h', 778 'elm_naviframe_item_eo.legacy.h',
779 'elm_notify_eo.h',
780 'elm_notify_eo.legacy.h',
780] 781]
781 782
782elementary_header_src = [ 783elementary_header_src = [