timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Jean-Philippe Andre 2017-05-25 19:12:08 +09:00
parent 356ad74377
commit 71678f301a
8 changed files with 39 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Makefile_Ecore.am
View File

@ -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}

34
src/lib/ecore/Ecore_Common.h
View File

@ -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
*/

2
src/lib/ecore/ecore_poller.eo
View File

@ -1,4 +1,4 @@
import ecore_types;
type @extern Ecore_Task_Cb: __undefined_type; [[Ecore task callback type]]
enum Ecore.Poller_Type
{

29
src/lib/ecore/ecore_types.eot
View File

@ -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)]]
}

2
src/lib/ecore/efl_loop_timer.eo
View File

@ -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

1
src/lib/elementary/elm_box.eo
View File

@ -1,5 +1,4 @@
import evas_box;
import ecore_types;
class Elm.Box (Elm.Widget)
{

4
src/lib/elementary/elm_gengrid.eo
View File

@ -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 {

2
src/tests/eolian_cxx/callback.eo
View File

@ -1,5 +1,3 @@
import ecore_types;
struct Callback_Event
{
field1: int;