aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-01-04 15:29:56 +0100
committerCedric BAIL <cedric.bail@free.fr>2019-01-04 11:03:38 -0800
commitefd0efb316324281ecd50c1cba2aaf0ee1feab10 (patch)
tree3a4f49f4b866e1fc6cda7b013dd340a67f692ea1
parentmeson: support cmakeconfigs (diff)
downloadefl-efd0efb316324281ecd50c1cba2aaf0ee1feab10.tar.gz
eo: move definitions of priority from Eo.h to the object
So it can be references from the later coming definition of callback_forwarder ref https://phab.enlightenment.org/D7532 Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D7542
-rw-r--r--src/lib/eo/Eo.h25
-rw-r--r--src/lib/eo/efl_object.eo15
2 files changed, 15 insertions, 25 deletions
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index eac6bfe271..62210443a1 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -223,15 +223,6 @@ typedef void (*Efl_Del_Intercept) (Eo *obj_id);
typedef void (*Efl_Event_Cb)(void *data, const Efl_Event *event);
/**
- * @brief Callback priority value. Range is -32k - 32k. The lower the number,
- * the higher the priority.
- *
- * See @ref EFL_CALLBACK_PRIORITY_AFTER, @ref EFL_CALLBACK_PRIORITY_BEFORE @ref
- * EFL_CALLBACK_PRIORITY_DEFAULT
- */
-typedef short Efl_Callback_Priority;
-
-/**
* @struct _Efl_Callback_Array_Item
* @brief An item in an array of callback desc/func.
*
@@ -1987,22 +1978,6 @@ typedef void (*efl_key_data_free_func)(void *);
EAPI const Efl_Event_Description *efl_object_legacy_only_event_description_get(const char *_event_name);
/**
- * @def EFL_CALLBACK_PRIORITY_BEFORE
- * Slightly more prioritized than default.
- */
-#define EFL_CALLBACK_PRIORITY_BEFORE -100
-/**
- * @def EFL_CALLBACK_PRIORITY_DEFAULT
- * Default callback priority level
- */
-#define EFL_CALLBACK_PRIORITY_DEFAULT 0
-/**
- * @def EFL_CALLBACK_PRIORITY_AFTER
- * Slightly less prioritized than default.
- */
-#define EFL_CALLBACK_PRIORITY_AFTER 100
-
-/**
* Helper for sorting callbacks array. Automatically used by
* @ref EFL_CALLBACKS_ARRAY_DEFINE
*/
diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo
index 4bc643de4b..49a836c8e3 100644
--- a/src/lib/eo/efl_object.eo
+++ b/src/lib/eo/efl_object.eo
@@ -8,6 +8,21 @@ struct Efl.Event_Description {
restart: bool; [[$true if when the event is triggered again from a callback it'll start from where it was]]
}
+
+type Efl.Callback_Priority : short;
+[[
+ Callback priority. Range is -32k - 32k. The lower the number, the higher the priority.
+
+ See @Efl.Callback_Priority_Before @Efl.Callback_Priority_Default @Efl.Callback_Priority_After
+ ]]
+
+const Efl.Callback_Priority_Before : Efl.Callback_Priority = -100;
+[[Slightly more prioritized than default.]]
+const Efl.Callback_Priority_Default : Efl.Callback_Priority = 0;
+[[Default priority.]]
+const Efl.Callback_Priority_After : Efl.Callback_Priority = 100;
+[[Slightly less prioritized than default.]]
+
abstract Efl.Object
{
[[Abstract Efl object class]]