jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=71678f301ad609219a72b5d517837f21b69d85e3
commit 71678f301ad609219a72b5d517837f21b69d85e3
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Thu May 25 19:12:08 2017 +0900
ecore: Remove ecore_types.eot
This moves one enum from EO to legacy only (Ecore_Pos_Map).
Ideally the type should be in Ecore_Legacy and no Common, that
can be done later.
Ref T5522
---
src/Makefile_Ecore.am | 9 ++-------
src/lib/ecore/Ecore_Common.h | 34 ++++++++++++++++++++++++++++++++++
src/lib/ecore/ecore_poller.eo | 2 +-
src/lib/ecore/ecore_types.eot | 29 -----------------------------
src/lib/ecore/efl_loop_timer.eo | 2 --
src/lib/elementary/elm_box.eo | 1 -
src/lib/elementary/elm_gengrid.eo | 4 ++--
src/tests/eolian_cxx/callback.eo | 2 --
8 files changed, 39 insertions(+), 44 deletions(-)
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 97b91f0c89..4d08930a89 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -33,21 +33,16 @@ ecore_eolian_files = \
lib/ecore/efl_model_composite_boolean_children.eo \
$(ecore_eolian_files_legacy)
-ecore_eolian_type_files = \
- lib/ecore/ecore_types.eot
-
ecore_eolian_c = $(ecore_eolian_files:%.eo=%.eo.c)
ecore_eolian_h = $(ecore_eolian_files:%.eo=%.eo.h) \
- $(ecore_eolian_files_legacy:%.eo=%.eo.legacy.h) \
- $(ecore_eolian_type_files:%.eot=%.eot.h)
+ $(ecore_eolian_files_legacy:%.eo=%.eo.legacy.h)
BUILT_SOURCES += \
$(ecore_eolian_c) \
$(ecore_eolian_h)
ecoreeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
-ecoreeolianfiles_DATA = $(ecore_eolian_files) \
- $(ecore_eolian_type_files)
+ecoreeolianfiles_DATA = $(ecore_eolian_files)
EXTRA_DIST2 += ${ecoreeolianfiles_DATA}
diff --git a/src/lib/ecore/Ecore_Common.h b/src/lib/ecore/Ecore_Common.h
index 49e7e1ce1d..74b931c0d1 100644
--- a/src/lib/ecore/Ecore_Common.h
+++ b/src/lib/ecore/Ecore_Common.h
@@ -2703,6 +2703,40 @@ typedef enum _Ecore_Animator_Source
Ecore_Animator_Source;
*/
typedef Eina_Bool (*Ecore_Timeline_Cb)(void *data, double pos);
+/** Defines the position mappings for the animation. */
+typedef enum
+{
+ ECORE_POS_MAP_LINEAR = 0, /**< Linear 0.0 -> 1.0 */
+ ECORE_POS_MAP_ACCELERATE, /**< Start slow then speed up */
+ ECORE_POS_MAP_DECELERATE, /**< Start fast then slow down */
+ ECORE_POS_MAP_SINUSOIDAL, /**< Start slow, speed up then slow down at end */
+ ECORE_POS_MAP_ACCELERATE_FACTOR, /**< Start slow then speed up, v1 being a
+ * power factor, 0.0 being linear, 1.0 being
+ * normal accelerate, 2.0 being much more
+ * pronounced accelerate (squared), 3.0
+ * being cubed, etc. */
+ ECORE_POS_MAP_DECELERATE_FACTOR, /**< Start fast then slow down, v1 being a
+ * power factor, 0.0 being linear, 1.0 being
+ * normal decelerate, 2.0 being much more
+ * pronounced decelerate (squared), 3.0
+ * being cubed, etc. */
+ ECORE_POS_MAP_SINUSOIDAL_FACTOR, /**< Start slow, speed up then slow down at
+ * end, v1 being a power factor, 0.0 being
+ * linear, 1.0 being normal sinusoidal, 2.0
+ * being much more pronounced sinusoidal
+ * (squared), 3.0 being cubed, etc. */
+ ECORE_POS_MAP_DIVISOR_INTERP, /**< Start at gradient * v1, interpolated via
+ * power of v2 curve */
+ ECORE_POS_MAP_BOUNCE, /**< Start at 0.0 then "drop" like a ball bouncing to
+ * the ground at 1.0, and bounce v2 times, with decay
+ * factor of v1 */
+ ECORE_POS_MAP_SPRING, /**< Start at 0.0 then "wobble" like a spring rest
+ * position 1.0, and wobble v2 times, with decay factor
+ * of v1 */
+ ECORE_POS_MAP_CUBIC_BEZIER /**< Follow the cubic-bezier curve calculated with
+ * the control points (x1, y1), (x2, y2) */
+} Ecore_Pos_Map;
+
/*
* @since 1.8
*/
diff --git a/src/lib/ecore/ecore_poller.eo b/src/lib/ecore/ecore_poller.eo
index d1703e987b..c5ef3d76f5 100644
--- a/src/lib/ecore/ecore_poller.eo
+++ b/src/lib/ecore/ecore_poller.eo
@@ -1,4 +1,4 @@
-import ecore_types;
+type @extern Ecore_Task_Cb: __undefined_type; [[Ecore task callback type]]
enum Ecore.Poller_Type
{
diff --git a/src/lib/ecore/ecore_types.eot b/src/lib/ecore/ecore_types.eot
deleted file mode 100644
index 3bd094769b..0000000000
--- a/src/lib/ecore/ecore_types.eot
+++ /dev/null
@@ -1,29 +0,0 @@
-type @extern Ecore_Task_Cb: __undefined_type; [[Ecore task callback type]]
-
-enum Ecore.Pos_Map
-{
- [[Defines the position mappings for the animation.]]
- linear, [[Linear 0.0 -> 1.0]]
- accelerate, [[Start slow then speed up]]
- decelerate, [[Start fast then slow down]]
- sinusoidal, [[Start slow, speed up then slow down at end]]
- accelerate_factor, [[Start slow then speed up, v1 being a power factor,
- 0.0 being linear, 1.0 being normal accelerate,
- 2.0 being much more pronounced accelerate (squared),
- 3.0 being cubed, etc.]]
- decelerate_factor, [[Start fast then slow down, v1 being a power factor,
- 0.0 being linear, 1.0 being normal decelerate,
- 2.0 being much more pronounced decelerate (squared),
- 3.0 being cubed, etc.]]
- sinusoidal_factor, [[Start slow, speed up then slow down at end,
- v1 being a power factor, 0.0 being linear,
- 1.0 being normal sinusoidal, 2.0 being much more
- pronounced sinusoidal (squared), 3.0 being cubed,
etc.]]
- divisor_interp, [[Start at gradient * v1, interpolated via power of v2
curve]]
- bounce, [[Start at 0.0 then "drop" like a ball bouncing to the ground at
1.0,
- and bounce v2 times, with decay factor of v1]]
- spring, [[Start at 0.0 then "wobble" like a spring rest position 1.0,
- and wobble v2 times, with decay factor of v1]]
- cubic_bezier, [[Follow the cubic-bezier curve calculated with the control
- points (x1, y1), (x2, y2)]]
-}
diff --git a/src/lib/ecore/efl_loop_timer.eo b/src/lib/ecore/efl_loop_timer.eo
index 11fb81f64b..61b0fab405 100644
--- a/src/lib/ecore/efl_loop_timer.eo
+++ b/src/lib/ecore/efl_loop_timer.eo
@@ -1,5 +1,3 @@
-import ecore_types;
-
class Efl.Loop.Timer (Efl.Loop_User)
{
[[Timers are objects that will call a given callback at some point
diff --git a/src/lib/elementary/elm_box.eo b/src/lib/elementary/elm_box.eo
index 1686fae22e..7463045ba7 100644
--- a/src/lib/elementary/elm_box.eo
+++ b/src/lib/elementary/elm_box.eo
@@ -1,5 +1,4 @@
import evas_box;
-import ecore_types;
class Elm.Box (Elm.Widget)
{
diff --git a/src/lib/elementary/elm_gengrid.eo
b/src/lib/elementary/elm_gengrid.eo
index 4f042ebe33..756f2dbbb2 100644
--- a/src/lib/elementary/elm_gengrid.eo
+++ b/src/lib/elementary/elm_gengrid.eo
@@ -1,8 +1,8 @@
import elm_general;
-import ecore_types;
import elm_gengrid_item;
type @extern Elm.Glob.Match_Flags: __undefined_type;
+type @extern Ecore_Pos_Map: __undefined_type;
enum Elm.Gengrid.Reorder_Type
{
@@ -532,7 +532,7 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
@since 1.10
]]
params {
- @in tween_mode: Ecore.Pos_Map; [[ Position mappings for animation
]]
+ @in tween_mode: Ecore_Pos_Map; [[ Position mappings for animation
]]
}
}
reorder_mode_stop {
diff --git a/src/tests/eolian_cxx/callback.eo b/src/tests/eolian_cxx/callback.eo
index 959c65530d..2e528d5f56 100644
--- a/src/tests/eolian_cxx/callback.eo
+++ b/src/tests/eolian_cxx/callback.eo
@@ -1,5 +1,3 @@
-import ecore_types;
-
struct Callback_Event
{
field1: int;
--
