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

efl: move Efl.Gfx.Gradient_* to Efl.Gfx.Gradient.* much nicer for bindings.

This commit is contained in:
Cedric BAIL 2015-04-03 16:30:35 +02:00
parent 1e18631554
commit 32de8d9e5f
15 changed files with 68 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile_Efl.am
View File

@ -10,7 +10,7 @@ efl_eolian_files = \
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.eo \
lib/efl/interfaces/efl_gfx_gradient_base.eo \
lib/efl/interfaces/efl_gfx_gradient_linear.eo \
lib/efl/interfaces/efl_gfx_gradient_radial.eo

2
src/Makefile_Efl_Cxx.am
View File

@ -14,7 +14,7 @@ generated_efl_cxx_bindings = \
lib/efl/interfaces/efl_gfx_fill.eo.hh \
lib/efl/interfaces/efl_gfx_view.eo.hh \
lib/efl/interfaces/efl_gfx_shape.eo.hh \
lib/efl/interfaces/efl_gfx_gradient.eo.hh \
lib/efl/interfaces/efl_gfx_gradient_base.eo.hh \
lib/efl/interfaces/efl_gfx_gradient_linear.eo.hh \
lib/efl/interfaces/efl_gfx_gradient_radial.eo.hh

10
src/lib/ector/ector_renderer_generic_gradient.eo
View File

@ -1,11 +1,11 @@
abstract Ector.Renderer.Generic.Gradient (Ector.Renderer.Generic.Base, Efl.Gfx.Gradient)
abstract Ector.Renderer.Generic.Gradient (Ector.Renderer.Generic.Base, Efl.Gfx.Gradient.Base)
{
eo_prefix: ector_renderer_gradient;
legacy_prefix: null;
implements {
Efl.Gfx.Gradient.stop.set;
Efl.Gfx.Gradient.stop.get;
Efl.Gfx.Gradient.spread.set;
Efl.Gfx.Gradient.spread.get;
Efl.Gfx.Gradient.Base.stop.set;
Efl.Gfx.Gradient.Base.stop.get;
Efl.Gfx.Gradient.Base.spread.set;
Efl.Gfx.Gradient.Base.spread.get;
}
}

10
src/lib/ector/ector_renderer_generic_gradient_linear.eo
View File

@ -1,11 +1,11 @@
abstract Ector.Renderer.Generic.Gradient_Linear (Ector.Renderer.Generic.Gradient, Efl.Gfx.Gradient_Linear)
abstract Ector.Renderer.Generic.Gradient_Linear (Ector.Renderer.Generic.Gradient, Efl.Gfx.Gradient.Linear)
{
eo_prefix: ector_renderer_gradient_linear;
legacy_prefix: null;
implements {
Efl.Gfx.Gradient_Linear.start.set;
Efl.Gfx.Gradient_Linear.start.get;
Efl.Gfx.Gradient_Linear.end.set;
Efl.Gfx.Gradient_Linear.end.get;
Efl.Gfx.Gradient.Linear.start.set;
Efl.Gfx.Gradient.Linear.start.get;
Efl.Gfx.Gradient.Linear.end.set;
Efl.Gfx.Gradient.Linear.end.get;
}
}

14
src/lib/ector/ector_renderer_generic_gradient_radial.eo
View File

@ -1,13 +1,13 @@
abstract Ector.Renderer.Generic.Gradient_Radial (Ector.Renderer.Generic.Gradient, Efl.Gfx.Gradient_Radial)
abstract Ector.Renderer.Generic.Gradient_Radial (Ector.Renderer.Generic.Gradient, Efl.Gfx.Gradient.Radial)
{
eo_prefix: ector_renderer_gradient_radial;
legacy_prefix: null;
implements {
Efl.Gfx.Gradient_Radial.center.set;
Efl.Gfx.Gradient_Radial.center.get;
Efl.Gfx.Gradient_Radial.radius.set;
Efl.Gfx.Gradient_Radial.radius.get;
Efl.Gfx.Gradient_Radial.focal.set;
Efl.Gfx.Gradient_Radial.focal.get;
Efl.Gfx.Gradient.Radial.center.set;
Efl.Gfx.Gradient.Radial.center.get;
Efl.Gfx.Gradient.Radial.radius.set;
Efl.Gfx.Gradient.Radial.radius.get;
Efl.Gfx.Gradient.Radial.focal.set;
Efl.Gfx.Gradient.Radial.focal.get;
}
}

26
src/lib/ector/ector_renderer_gradient.c
View File

@ -8,10 +8,10 @@
#include "ector_private.h"
static void
_ector_renderer_generic_gradient_efl_gfx_gradient_stop_set(Eo *obj,
Ector_Renderer_Generic_Gradient_Data *pd,
const Efl_Gfx_Gradient_Stop *colors,
unsigned int length)
_ector_renderer_generic_gradient_efl_gfx_gradient_base_stop_set(Eo *obj EINA_UNUSED,
Ector_Renderer_Generic_Gradient_Data *pd,
const Efl_Gfx_Gradient_Stop *colors,
unsigned int length)
{
pd->colors = realloc(pd->colors, length * sizeof(Efl_Gfx_Gradient_Stop));
if (!pd->colors)
@ -25,26 +25,26 @@ _ector_renderer_generic_gradient_efl_gfx_gradient_stop_set(Eo *obj,
}
static void
_ector_renderer_generic_gradient_efl_gfx_gradient_stop_get(Eo *obj,
Ector_Renderer_Generic_Gradient_Data *pd,
const Efl_Gfx_Gradient_Stop **colors,
unsigned int *length)
_ector_renderer_generic_gradient_efl_gfx_gradient_base_stop_get(Eo *obj EINA_UNUSED,
Ector_Renderer_Generic_Gradient_Data *pd,
const Efl_Gfx_Gradient_Stop **colors,
unsigned int *length)
{
if (colors) *colors = pd->colors;
if (length) *length = pd->colors_count;
}
static void
_ector_renderer_generic_gradient_efl_gfx_gradient_spread_set(Eo *obj,
Ector_Renderer_Generic_Gradient_Data *pd,
Efl_Gfx_Gradient_Spread s)
_ector_renderer_generic_gradient_efl_gfx_gradient_base_spread_set(Eo *obj EINA_UNUSED,
Ector_Renderer_Generic_Gradient_Data *pd,
Efl_Gfx_Gradient_Spread s)
{
pd->s = s;
}
static Efl_Gfx_Gradient_Spread
_ector_renderer_generic_gradient_efl_gfx_gradient_spread_get(Eo *obj,
Ector_Renderer_Generic_Gradient_Data *pd)
_ector_renderer_generic_gradient_efl_gfx_gradient_base_spread_get(Eo *obj EINA_UNUSED,
Ector_Renderer_Generic_Gradient_Data *pd)
{
return pd->s;
}

2
src/lib/efl/Efl.h
View File

@ -142,7 +142,7 @@ typedef enum _Efl_Gfx_Fill_Spread
#include "interfaces/efl_gfx_fill.eo.h"
#include "interfaces/efl_gfx_view.eo.h"
#include "interfaces/efl_gfx_shape.eo.h"
#include "interfaces/efl_gfx_gradient.eo.h"
#include "interfaces/efl_gfx_gradient_base.eo.h"
#include "interfaces/efl_gfx_gradient_linear.eo.h"
#include "interfaces/efl_gfx_gradient_radial.eo.h"

3
src/lib/efl/interfaces/efl_gfx_gradient.eo → src/lib/efl/interfaces/efl_gfx_gradient_base.eo
View File

@ -1,5 +1,6 @@
interface Efl.Gfx.Gradient
interface Efl.Gfx.Gradient.Base
{
eo_prefix: efl_gfx_gradient;
legacy_prefix: null;
properties {
stop {

2
src/lib/efl/interfaces/efl_gfx_gradient_linear.eo
View File

@ -1,4 +1,4 @@
interface Efl.Gfx.Gradient_Linear (Efl.Gfx.Gradient)
interface Efl.Gfx.Gradient.Linear (Efl.Gfx.Gradient.Base)
{
legacy_prefix: null;
properties {

2
src/lib/efl/interfaces/efl_gfx_gradient_radial.eo
View File

@ -1,4 +1,4 @@
interface Efl.Gfx.Gradient_Radial (Efl.Gfx.Gradient)
interface Efl.Gfx.Gradient.Radial (Efl.Gfx.Gradient.Base)
{
legacy_prefix: null;
properties {

2
src/lib/efl/interfaces/efl_interfaces_main.c
View File

@ -16,6 +16,6 @@
#include "interfaces/efl_gfx_fill.eo.c"
#include "interfaces/efl_gfx_view.eo.c"
#include "interfaces/efl_gfx_gradient.eo.c"
#include "interfaces/efl_gfx_gradient_base.eo.c"
#include "interfaces/efl_gfx_gradient_linear.eo.c"
#include "interfaces/efl_gfx_gradient_radial.eo.c"

26
src/lib/evas/canvas/evas_vg_gradient.c
View File

@ -6,10 +6,10 @@
#include <strings.h>
static void
_evas_vg_gradient_efl_gfx_gradient_stop_set(Eo *obj EINA_UNUSED,
Evas_VG_Gradient_Data *pd,
const Efl_Gfx_Gradient_Stop *colors,
unsigned int length)
_evas_vg_gradient_efl_gfx_gradient_base_stop_set(Eo *obj EINA_UNUSED,
Evas_VG_Gradient_Data *pd,
const Efl_Gfx_Gradient_Stop *colors,
unsigned int length)
{
pd->colors = realloc(pd->colors, length * sizeof(Efl_Gfx_Gradient_Stop));
if (!pd->colors)
@ -23,26 +23,26 @@ _evas_vg_gradient_efl_gfx_gradient_stop_set(Eo *obj EINA_UNUSED,
}
static void
_evas_vg_gradient_efl_gfx_gradient_stop_get(Eo *obj EINA_UNUSED,
Evas_VG_Gradient_Data *pd,
const Efl_Gfx_Gradient_Stop **colors,
unsigned int *length)
_evas_vg_gradient_efl_gfx_gradient_base_stop_get(Eo *obj EINA_UNUSED,
Evas_VG_Gradient_Data *pd,
const Efl_Gfx_Gradient_Stop **colors,
unsigned int *length)
{
if (colors) *colors = pd->colors;
if (length) *length = pd->colors_count;
}
static void
_evas_vg_gradient_efl_gfx_gradient_spread_set(Eo *obj EINA_UNUSED,
Evas_VG_Gradient_Data *pd,
Efl_Gfx_Gradient_Spread s)
_evas_vg_gradient_efl_gfx_gradient_base_spread_set(Eo *obj EINA_UNUSED,
Evas_VG_Gradient_Data *pd,
Efl_Gfx_Gradient_Spread s)
{
pd->s = s;
}
static Efl_Gfx_Gradient_Spread
_evas_vg_gradient_efl_gfx_gradient_spread_get(Eo *obj EINA_UNUSED,
Evas_VG_Gradient_Data *pd)
_evas_vg_gradient_efl_gfx_gradient_base_spread_get(Eo *obj EINA_UNUSED,
Evas_VG_Gradient_Data *pd)
{
return pd->s;
}

10
src/lib/evas/canvas/evas_vg_gradient.eo
View File

@ -1,11 +1,11 @@
abstract Evas.VG_Gradient (Evas.VG_Node, Efl.Gfx.Gradient)
abstract Evas.VG_Gradient (Evas.VG_Node, Efl.Gfx.Gradient.Base)
{
eo_prefix: evas_vg_gradient;
legacy_prefix: null;
implements {
Efl.Gfx.Gradient.stop.set;
Efl.Gfx.Gradient.stop.get;
Efl.Gfx.Gradient.spread.set;
Efl.Gfx.Gradient.spread.get;
Efl.Gfx.Gradient.Base.stop.set;
Efl.Gfx.Gradient.Base.stop.get;
Efl.Gfx.Gradient.Base.spread.set;
Efl.Gfx.Gradient.Base.spread.get;
}
}

10
src/lib/evas/canvas/evas_vg_gradient_linear.eo
View File

@ -1,12 +1,12 @@
class Evas.VG_Gradient_Linear (Evas.VG_Gradient, Efl.Gfx.Gradient_Linear)
class Evas.VG_Gradient_Linear (Evas.VG_Gradient, Efl.Gfx.Gradient.Linear)
{
eo_prefix: evas_vg_gradient_linear;
legacy_prefix: null;
implements {
Efl.Gfx.Gradient_Linear.start.set;
Efl.Gfx.Gradient_Linear.start.get;
Efl.Gfx.Gradient_Linear.end.set;
Efl.Gfx.Gradient_Linear.end.get;
Efl.Gfx.Gradient.Linear.start.set;
Efl.Gfx.Gradient.Linear.start.get;
Efl.Gfx.Gradient.Linear.end.set;
Efl.Gfx.Gradient.Linear.end.get;
Eo.Base.constructor;
Eo.Base.destructor;
}

14
src/lib/evas/canvas/evas_vg_gradient_radial.eo
View File

@ -1,14 +1,14 @@
class Evas.VG_Gradient_Radial (Evas.VG_Gradient, Efl.Gfx.Gradient_Radial)
class Evas.VG_Gradient_Radial (Evas.VG_Gradient, Efl.Gfx.Gradient.Radial)
{
eo_prefix: evas_vg_gradient_radial;
legacy_prefix: null;
implements {
Efl.Gfx.Gradient_Radial.center.set;
Efl.Gfx.Gradient_Radial.center.get;
Efl.Gfx.Gradient_Radial.radius.set;
Efl.Gfx.Gradient_Radial.radius.get;
Efl.Gfx.Gradient_Radial.focal.set;
Efl.Gfx.Gradient_Radial.focal.get;
Efl.Gfx.Gradient.Radial.center.set;
Efl.Gfx.Gradient.Radial.center.get;
Efl.Gfx.Gradient.Radial.radius.set;
Efl.Gfx.Gradient.Radial.radius.get;
Efl.Gfx.Gradient.Radial.focal.set;
Efl.Gfx.Gradient.Radial.focal.get;
Eo.Base.constructor;
Eo.Base.destructor;
}