jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=21c72948dbc926db77e355c1fb18026e13d043c3
commit 21c72948dbc926db77e355c1fb18026e13d043c3 Author: Jean-Philippe Andre <[email protected]> Date: Wed Sep 13 17:00:14 2017 +0900 efl_gfx: Remove color_part API (EO) This API was introduced in commit: cd3f8db506379a770ef37134748a64adfae66ab3 This was since limited to EO only APIs, and totally underexploited. After that, efl_part() was introduced, which defines how all part APIs should be designed. Nothing uses this API, efl_vg had an implementation that provides no extra value over the other APIs. --- src/lib/efl/interfaces/efl_gfx.eo | 42 -------------------------------- src/lib/evas/canvas/efl_canvas_object.eo | 1 - src/lib/evas/canvas/efl_vg.eo | 1 - src/lib/evas/canvas/efl_vg_shape.eo | 1 - src/lib/evas/canvas/evas_object_main.c | 23 ----------------- src/lib/evas/canvas/evas_vg_node.c | 22 ----------------- src/lib/evas/canvas/evas_vg_shape.c | 28 --------------------- 7 files changed, 118 deletions(-) diff --git a/src/lib/efl/interfaces/efl_gfx.eo b/src/lib/efl/interfaces/efl_gfx.eo index 1670ddc3c6..bea1ca652a 100644 --- a/src/lib/efl/interfaces/efl_gfx.eo +++ b/src/lib/efl/interfaces/efl_gfx.eo @@ -89,48 +89,6 @@ interface Efl.Gfx { a: int; [[The alpha component of the given color.]] } } - @property color_part { - set { - [[Sets a specifc color of the given Efl.Gfx object to the - given one. - - See also @.color.get (for an example) - - These color values are expected to be premultiplied by alpha. - ]] - return: bool; [[$true when color was set, $false otherwise]] - } - get { - [[Retrieves a specific color of the given Evas object. - - Retrieves a specific color's RGB component (and alpha channel) - values, which range from 0 to 255. For the alpha channel, - which defines the object's transparency level, 0 means totally - transparent, while 255 means opaque. These color values are - premultiplied by the alpha value. - - The main color being mapped to null. - - Usually youll use this attribute for text and rectangle objects, - where the main color is their unique one. If set for objects - which themselves have colors, like the images one, those colors - get modulated by this one. - - Use null pointers on the components you're not interested - in: they'll be ignored by the function. - ]] - return: bool; [[$true when color was retrieved, $false otherwise]] - } - keys { - part: string; [[The part you are interested in.]] - } - values { - r: int; [[The red component of the given color.]] - g: int; [[The green component of the given color.]] - b: int; [[The blue component of the given color.]] - a: int; [[The alpha component of the given color.]] - } - } @property visible { set { [[Makes the given Evas object visible or invisible.]] diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo index 6acd2218b0..61c59497dd 100644 --- a/src/lib/evas/canvas/efl_canvas_object.eo +++ b/src/lib/evas/canvas/efl_canvas_object.eo @@ -665,7 +665,6 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator, Efl.Object.debug_name_override; Efl.Gfx.visible { get; set; } Efl.Gfx.color { get; set; } - Efl.Gfx.color_part { get; set; } Efl.Gfx.geometry { get; set; } Efl.Gfx.position { get; set; } Efl.Gfx.size { get; set; } diff --git a/src/lib/evas/canvas/efl_vg.eo b/src/lib/evas/canvas/efl_vg.eo index df69ae1aaf..beb132851d 100644 --- a/src/lib/evas/canvas/efl_vg.eo +++ b/src/lib/evas/canvas/efl_vg.eo @@ -116,7 +116,6 @@ abstract Efl.VG (Efl.Object, Efl.Gfx, Efl.Gfx.Stack) Efl.Object.destructor; Efl.Gfx.visible { get; set; } Efl.Gfx.color { get; set; } - Efl.Gfx.color_part { get; set; } Efl.Gfx.size { get; } Efl.Gfx.position { get; set; } Efl.Gfx.geometry { get; } diff --git a/src/lib/evas/canvas/efl_vg_shape.eo b/src/lib/evas/canvas/efl_vg_shape.eo index a3e602048c..888ea4590c 100644 --- a/src/lib/evas/canvas/efl_vg_shape.eo +++ b/src/lib/evas/canvas/efl_vg_shape.eo @@ -35,7 +35,6 @@ class Efl.VG.Shape (Efl.VG, Efl.Gfx.Shape) } } implements { - Efl.Gfx.color_part { get; set; } Efl.VG.bounds_get; Efl.VG.interpolate; Efl.VG.dup; diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index e8efe87265..8ad0e78c2a 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -1934,17 +1934,6 @@ _efl_canvas_object_efl_gfx_color_set(Eo *eo_obj, Evas_Object_Protected_Data *obj evas_object_change(eo_obj, obj); } -EOLIAN static Eina_Bool -_efl_canvas_object_efl_gfx_color_part_set(Eo *obj, Evas_Object_Protected_Data *pd, - const char *part, - int r, int g, int b, int a) -{ - if (part) return EINA_FALSE; - - _efl_canvas_object_efl_gfx_color_set(obj, pd, r, g, b, a); - return EINA_TRUE; -} - EAPI void evas_object_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a) { @@ -1970,18 +1959,6 @@ _efl_canvas_object_efl_gfx_color_get(Eo *eo_obj EINA_UNUSED, if (a) *a = obj->cur->color.a; } -EOLIAN static Eina_Bool -_efl_canvas_object_efl_gfx_color_part_get(Eo *obj, - Evas_Object_Protected_Data *pd, - const char *part, - int *r, int *g, int *b, int *a) -{ - if (part) return EINA_FALSE; - - _efl_canvas_object_efl_gfx_color_get(obj, pd, r, g, b, a); - return EINA_TRUE; -} - EOLIAN static void _efl_canvas_object_anti_alias_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool anti_alias) { diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c index f6ce22d4eb..3267f76bc5 100644 --- a/src/lib/evas/canvas/evas_vg_node.c +++ b/src/lib/evas/canvas/evas_vg_node.c @@ -159,17 +159,6 @@ _efl_vg_efl_gfx_color_set(Eo *obj EINA_UNUSED, _efl_vg_changed(obj); } -static Eina_Bool -_efl_vg_efl_gfx_color_part_set(Eo *obj, Efl_VG_Data *pd, - const char *part, - int r, int g, int b, int a) -{ - if (part) return EINA_FALSE; - - _efl_vg_efl_gfx_color_set(obj, pd, r, g, b, a); - return EINA_TRUE; -} - static void _efl_vg_efl_gfx_color_get(Eo *obj EINA_UNUSED, Efl_VG_Data *pd, @@ -181,17 +170,6 @@ _efl_vg_efl_gfx_color_get(Eo *obj EINA_UNUSED, if (a) *a = pd->a; } -static Eina_Bool -_efl_vg_efl_gfx_color_part_get(Eo *obj, Efl_VG_Data *pd, - const char *part, - int *r, int *g, int *b, int *a) -{ - if (part) return EINA_FALSE; - - _efl_vg_efl_gfx_color_get(obj, pd, r, g, b, a); - return EINA_TRUE; -} - static void _efl_vg_mask_set(Eo *obj EINA_UNUSED, Efl_VG_Data *pd, diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c index a4e441c284..a53eb98772 100644 --- a/src/lib/evas/canvas/evas_vg_shape.c +++ b/src/lib/evas/canvas/evas_vg_shape.c @@ -44,34 +44,6 @@ _efl_vg_shape_fill_get(Eo *obj EINA_UNUSED, Efl_VG_Shape_Data *pd) return pd->fill; } -static Eina_Bool -_efl_vg_shape_efl_gfx_color_part_set(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED, - const char * part, - int r, int g, int b, int a) -{ - if (part && !strcmp(part, "stroke")) - { - efl_gfx_shape_stroke_color_set(obj, r, g, b, a); - return EINA_TRUE; - } - - return efl_gfx_color_part_set(efl_super(obj, EFL_VG_SHAPE_CLASS), part, r, g, b, a); -} - -static Eina_Bool -_efl_vg_shape_efl_gfx_color_part_get(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED, - const char * part, - int *r, int *g, int *b, int *a) -{ - if (part && !strcmp(part, "stroke")) - { - efl_gfx_shape_stroke_color_get(obj, r, g, b, a); - return EINA_TRUE; - } - - return efl_gfx_color_part_get(efl_super(obj, EFL_VG_SHAPE_CLASS), part, r, g, b, a); -} - static void _efl_vg_shape_stroke_fill_set(Eo *obj EINA_UNUSED, Efl_VG_Shape_Data *pd, --
