From b8f7e908774181cad32d76c3a75ff84a176d49fa Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Fri, 26 Dec 2014 11:17:13 +0100 Subject: [PATCH] efl: introduce an Efl Gradient Radial interface. Change-Id: I3918a36523191dfb52a9c80b75572a8ac36ef5ed --- src/Makefile_Efl.am | 3 +- src/lib/efl/Efl.h | 1 + .../efl/interfaces/efl_graphics_gradient_radial.eo | 35 +++++++++++++++++++ src/lib/efl/interfaces/efl_interfaces_main.c | 1 + src/lib/evas/canvas/evas_vg_gradient_radial.c | 34 +++++++++---------- src/lib/evas/canvas/evas_vg_gradient_radial.eo | 39 +++++----------------- 6 files changed, 64 insertions(+), 49 deletions(-) create mode 100644 src/lib/efl/interfaces/efl_graphics_gradient_radial.eo diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am index 88fe605..0c4d8b9 100644 --- a/src/Makefile_Efl.am +++ b/src/Makefile_Efl.am @@ -7,7 +7,8 @@ efl_eolian_files = \ lib/efl/interfaces/efl_text_properties.eo \ lib/efl/interfaces/efl_graphics_shape.eo \ lib/efl/interfaces/efl_graphics_gradient.eo \ - lib/efl/interfaces/efl_graphics_gradient_linear.eo + lib/efl/interfaces/efl_graphics_gradient_linear.eo \ + lib/efl/interfaces/efl_graphics_gradient_radial.eo efl_eolian_files_h = $(efl_eolian_files:%.eo=%.eo.h) efl_eolian_files_c = $(efl_eolian_files:%.eo=%.eo.c) diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h index c1dba01..043fd23 100644 --- a/src/lib/efl/Efl.h +++ b/src/lib/efl/Efl.h @@ -129,6 +129,7 @@ typedef enum _Efl_Graphics_Gradient_Spread #include "interfaces/efl_graphics_shape.eo.h" #include "interfaces/efl_graphics_gradient.eo.h" #include "interfaces/efl_graphics_gradient_linear.eo.h" +#include "interfaces/efl_graphics_gradient_radial.eo.h" #if defined ( __cplusplus ) } diff --git a/src/lib/efl/interfaces/efl_graphics_gradient_radial.eo b/src/lib/efl/interfaces/efl_graphics_gradient_radial.eo new file mode 100644 index 0000000..8fd00c7 --- /dev/null +++ b/src/lib/efl/interfaces/efl_graphics_gradient_radial.eo @@ -0,0 +1,35 @@ +interface Efl.Graphics.Gradient_Radial (Efl.Graphics.Gradient) +{ + legacy_prefix: null; + properties { + center { + set { + } + get { + } + values { + double x; + double y; + } + } + radius { + set { + } + get { + } + values { + double r; + } + } + focal { + set { + } + get { + } + values { + double x; + double y; + } + } + } +} diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c index 95b9ff0..eabc1e0 100644 --- a/src/lib/efl/interfaces/efl_interfaces_main.c +++ b/src/lib/efl/interfaces/efl_interfaces_main.c @@ -14,3 +14,4 @@ #include "interfaces/efl_graphics_shape.eo.c" #include "interfaces/efl_graphics_gradient.eo.c" #include "interfaces/efl_graphics_gradient_linear.eo.c" +#include "interfaces/efl_graphics_gradient_radial.eo.c" diff --git a/src/lib/evas/canvas/evas_vg_gradient_radial.c b/src/lib/evas/canvas/evas_vg_gradient_radial.c index 04ab5bb..fecec50 100644 --- a/src/lib/evas/canvas/evas_vg_gradient_radial.c +++ b/src/lib/evas/canvas/evas_vg_gradient_radial.c @@ -11,51 +11,51 @@ struct _Evas_VG_Gradient_Radial_Data }; void -_evas_vg_gradient_radial_center_set(Eo *obj EINA_UNUSED, - Evas_VG_Gradient_Radial_Data *pd, - double x, double y) +_evas_vg_gradient_radial_efl_graphics_gradient_radial_center_set(Eo *obj EINA_UNUSED, + Evas_VG_Gradient_Radial_Data *pd, + double x, double y) { pd->center.x = x; pd->center.y = y; } void -_evas_vg_gradient_radial_center_get(Eo *obj EINA_UNUSED, - Evas_VG_Gradient_Radial_Data *pd, - double *x, double *y) +_evas_vg_gradient_radial_efl_graphics_gradient_radial_center_get(Eo *obj EINA_UNUSED, + Evas_VG_Gradient_Radial_Data *pd, + double *x, double *y) { if (x) *x = pd->center.x; if (y) *y = pd->center.y; } void -_evas_vg_gradient_radial_radius_set(Eo *obj EINA_UNUSED, - Evas_VG_Gradient_Radial_Data *pd, - double r) +_evas_vg_gradient_radial_efl_graphics_gradient_radial_radius_set(Eo *obj EINA_UNUSED, + Evas_VG_Gradient_Radial_Data *pd, + double r) { pd->radius = r; } double -_evas_vg_gradient_radial_radius_get(Eo *obj EINA_UNUSED, - Evas_VG_Gradient_Radial_Data *pd) +_evas_vg_gradient_radial_efl_graphics_gradient_radial_radius_get(Eo *obj EINA_UNUSED, + Evas_VG_Gradient_Radial_Data *pd) { return pd->radius; } void -_evas_vg_gradient_radial_focal_set(Eo *obj EINA_UNUSED, - Evas_VG_Gradient_Radial_Data *pd, - double x, double y) +_evas_vg_gradient_radial_efl_graphics_gradient_radial_focal_set(Eo *obj EINA_UNUSED, + Evas_VG_Gradient_Radial_Data *pd, + double x, double y) { pd->focal.x = x; pd->focal.y = y; } void -_evas_vg_gradient_radial_focal_get(Eo *obj EINA_UNUSED, - Evas_VG_Gradient_Radial_Data *pd, - double *x, double *y) +_evas_vg_gradient_radial_efl_graphics_gradient_radial_focal_get(Eo *obj EINA_UNUSED, + Evas_VG_Gradient_Radial_Data *pd, + double *x, double *y) { if (x) *x = pd->focal.x; if (y) *y = pd->focal.y; diff --git a/src/lib/evas/canvas/evas_vg_gradient_radial.eo b/src/lib/evas/canvas/evas_vg_gradient_radial.eo index 0a7d548..a6bfe70 100644 --- a/src/lib/evas/canvas/evas_vg_gradient_radial.eo +++ b/src/lib/evas/canvas/evas_vg_gradient_radial.eo @@ -1,36 +1,13 @@ -class Evas.VG_Gradient_Radial (Evas.VG_Gradient) +class Evas.VG_Gradient_Radial (Evas.VG_Gradient, Efl.Graphics.Gradient_Radial) { eo_prefix: evas_vg_gradient_radial; legacy_prefix: null; - properties { - center { - set { - } - get { - } - values { - double x; - double y; - } - } - radius { - set { - } - get { - } - values { - double r; - } - } - focal { - set { - } - get { - } - values { - double x; - double y; - } - } + implements { + Efl.Graphics.Gradient_Radial.center.set; + Efl.Graphics.Gradient_Radial.center.get; + Efl.Graphics.Gradient_Radial.radius.set; + Efl.Graphics.Gradient_Radial.radius.get; + Efl.Graphics.Gradient_Radial.focal.set; + Efl.Graphics.Gradient_Radial.focal.get; } } -- 2.7.4