jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=618558f8ecba4d78f230245f2853523e95e12dfc
commit 618558f8ecba4d78f230245f2853523e95e12dfc Author: Jean-Philippe Andre <jp.an...@samsung.com> Date: Thu Nov 19 16:10:41 2015 +0900 Efl: eo-ify enum Efl.Gfx.Fill --- src/Makefile_Efl.am | 17 +++++++++++++---- src/lib/efl/Efl.h | 19 ++++++------------- src/lib/efl/interfaces/efl_gfx_fill.eo | 13 +++++++++++++ 3 files changed, 32 insertions(+), 17 deletions(-) diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am index b64223e..ea0809d 100644 --- a/src/Makefile_Efl.am +++ b/src/Makefile_Efl.am @@ -1,3 +1,8 @@ +# Even though libefl is new, it contains definitions used by legacy APIs +efl_eolian_legacy_files = \ + lib/efl/interfaces/efl_gfx_fill.eo \ + $(NULL) + efl_eolian_files = \ lib/efl/interfaces/efl_control.eo \ lib/efl/interfaces/efl_file.eo \ @@ -7,7 +12,6 @@ efl_eolian_files = \ lib/efl/interfaces/efl_text_properties.eo \ lib/efl/interfaces/efl_gfx_base.eo \ lib/efl/interfaces/efl_gfx_stack.eo \ - lib/efl/interfaces/efl_gfx_fill.eo \ lib/efl/interfaces/efl_gfx_view.eo \ lib/efl/interfaces/efl_gfx_shape.eo \ lib/efl/interfaces/efl_gfx_gradient_base.eo \ @@ -15,18 +19,22 @@ efl_eolian_files = \ lib/efl/interfaces/efl_gfx_gradient_radial.eo \ lib/efl/interfaces/efl_gfx_filter.eo \ lib/efl/interfaces/efl_model_base.eo \ + $(efl_eolian_legacy_files) \ $(NULL) efl_eolian_files_h = $(efl_eolian_files:%.eo=%.eo.h) efl_eolian_files_c = $(efl_eolian_files:%.eo=%.eo.c) +efl_eolian_legacy_files_h = $(efl_eolian_legacy_files:%.eo=%.eo.legacy.h) BUILT_SOURCES += \ $(efl_eolian_files_c) \ - $(efl_eolian_files_h) + $(efl_eolian_files_h) \ + $(efl_eolian_legacy_files_h) CLEANFILES += \ $(efl_eolian_files_c) \ - $(efl_eolian_files_h) + $(efl_eolian_files_h) \ + $(efl_eolian_legacy_files_h) EXTRA_DIST += \ lib/efl/Efl_Config.h \ @@ -55,7 +63,8 @@ dist_installed_eflheaders_DATA = \ installed_eflinterfacesdir = $(includedir)/efl-@VMAJ@/interfaces nodist_installed_eflinterfaces_DATA = \ -$(efl_eolian_files_h) + $(efl_eolian_files_h) \ + $(efl_eolian_legacy_files_h) if HAVE_ELUA diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h index 8358a1f..b525a18 100644 --- a/src/lib/efl/Efl.h +++ b/src/lib/efl/Efl.h @@ -123,19 +123,6 @@ typedef enum _Efl_Gfx_Gradient_Spread EFL_GFX_GRADIENT_SPREAD_LAST /**< End of enum value */ } Efl_Gfx_Gradient_Spread; -/** - * Type defining how an image content get filled. - * @since 1.14 - */ -typedef enum _Efl_Gfx_Fill_Spread -{ - EFL_GFX_FILL_REFLECT = 0, /**< image fill tiling mode - tiling reflects */ - EFL_GFX_FILL_REPEAT = 1, /**< tiling repeats */ - EFL_GFX_FILL_RESTRICT = 2, /**< tiling clamps - range offset ignored */ - EFL_GFX_FILL_RESTRICT_REFLECT = 3, /**< tiling clamps and any range offset reflects */ - EFL_GFX_FILL_RESTRICT_REPEAT = 4, /**< tiling clamps and any range offset repeats */ - EFL_GFX_FILL_PAD = 5 /**< tiling extends with end values */ -} Efl_Gfx_Fill_Spread; #ifdef EFL_BETA_API_SUPPORT @@ -166,6 +153,12 @@ EAPI extern const Eo_Event_Description _EFL_GFX_PATH_CHANGED; #include "interfaces/efl_gfx_gradient_radial.eo.h" #include "interfaces/efl_gfx_filter.eo.h" +#else + +#ifndef EFL_NOLEGACY_API_SUPPORT +#include "interfaces/efl_gfx_fill.eo.legacy.h" +#endif + #endif #if defined ( __cplusplus ) diff --git a/src/lib/efl/interfaces/efl_gfx_fill.eo b/src/lib/efl/interfaces/efl_gfx_fill.eo index cffaf82..51078bb 100644 --- a/src/lib/efl/interfaces/efl_gfx_fill.eo +++ b/src/lib/efl/interfaces/efl_gfx_fill.eo @@ -1,3 +1,16 @@ +enum Efl.Gfx.Fill.Spread { + [[Type defining how an image content gets filled. + @since 1.14 + ]] + legacy: Efl_Gfx_Fill; + reflect = 0, [[Image fill tiling mode - tiling reflects]] + repeat = 1, [[Tiling repeats]] + restrict = 2, [[Tiling clamps, range offset ignored]] + restrict_reflect = 3, [[Tiling clamps and any range offset reflects]] + restrict_repeat = 4, [[Tiling clamps and any range offset repeats]] + pad = 5, [[Tiling extends with end values]] +} + interface Efl.Gfx.Fill { legacy_prefix: null; methods { --