summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitesh Singh <amitesh.sh@samsung.com>2017-12-20 16:34:01 +0900
committerAmitesh Singh <amitesh.sh@samsung.com>2017-12-22 13:29:20 +0900
commit9db0ec554bf3f92c8e0c8e1733455955e2351e51 (patch)
treec9e7c9e848e918e75a051d6470a773502f9a52d2
parent14d10e8b7baeaf282ed607d068f84a4d56004519 (diff)
interface: add Efl.Gfx.Color interface for color related APIs
This would eventually turn into mixin class later after adding more color related helper functions.
-rw-r--r--src/Makefile_Efl.am1
-rw-r--r--src/lib/efl/Efl.h1
-rw-r--r--src/lib/efl/interfaces/efl_gfx.eo40
-rw-r--r--src/lib/efl/interfaces/efl_gfx_blur.eo2
-rw-r--r--src/lib/efl/interfaces/efl_gfx_buffer.eo2
-rw-r--r--src/lib/efl/interfaces/efl_gfx_color.eo46
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c1
-rw-r--r--src/lib/elementary/efl_ui_bg_widget.c4
-rw-r--r--src/lib/elementary/efl_ui_bg_widget.eo2
-rw-r--r--src/lib/elementary/efl_ui_image.c2
-rw-r--r--src/lib/elementary/efl_ui_image.eo6
-rw-r--r--src/lib/elementary/efl_ui_widget_part_bg.eo4
-rw-r--r--src/lib/elementary/efl_ui_widget_part_shadow.eo4
-rw-r--r--src/lib/elementary/efl_ui_win.c4
-rw-r--r--src/lib/elementary/efl_ui_win_part.eo5
-rw-r--r--src/lib/elementary/elm_widget.c10
-rw-r--r--src/lib/elementary/elm_widget.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_group.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo4
-rw-r--r--src/lib/evas/canvas/efl_vg.eo4
-rw-r--r--src/lib/evas/canvas/evas_object_main.c4
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c2
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c4
23 files changed, 83 insertions, 73 deletions
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index a1c31b8784..2b0f9a5043 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -2,6 +2,7 @@
2efl_eolian_legacy_files = \ 2efl_eolian_legacy_files = \
3 lib/efl/interfaces/efl_gfx_fill.eo \ 3 lib/efl/interfaces/efl_gfx_fill.eo \
4 lib/efl/interfaces/efl_gfx.eo \ 4 lib/efl/interfaces/efl_gfx.eo \
5 lib/efl/interfaces/efl_gfx_color.eo \
5 lib/efl/interfaces/efl_image.eo \ 6 lib/efl/interfaces/efl_image.eo \
6 lib/efl/interfaces/efl_image_animated.eo \ 7 lib/efl/interfaces/efl_image_animated.eo \
7 lib/efl/interfaces/efl_input_device.eo \ 8 lib/efl/interfaces/efl_input_device.eo \
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index bb22f9716c..8505afa176 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -115,6 +115,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
115 115
116/* Graphics */ 116/* Graphics */
117#include "interfaces/efl_gfx.eo.h" 117#include "interfaces/efl_gfx.eo.h"
118#include "interfaces/efl_gfx_color.eo.h"
118#include "interfaces/efl_gfx_buffer.eo.h" 119#include "interfaces/efl_gfx_buffer.eo.h"
119#include "interfaces/efl_gfx_stack.eo.h" 120#include "interfaces/efl_gfx_stack.eo.h"
120#include "interfaces/efl_gfx_fill.eo.h" 121#include "interfaces/efl_gfx_fill.eo.h"
diff --git a/src/lib/efl/interfaces/efl_gfx.eo b/src/lib/efl/interfaces/efl_gfx.eo
index 3d073c2fc7..c0ab8b325e 100644
--- a/src/lib/efl/interfaces/efl_gfx.eo
+++ b/src/lib/efl/interfaces/efl_gfx.eo
@@ -49,46 +49,6 @@ interface Efl.Gfx {
49 rect: Eina.Rect; [[The X,Y position and W,H size, in pixels.]] 49 rect: Eina.Rect; [[The X,Y position and W,H size, in pixels.]]
50 } 50 }
51 } 51 }
52 @property color {
53 set {
54 [[Sets the general/main color of the given Evas object to the given
55 one.
56
57 See also @.color.get (for an example)
58
59 These color values are expected to be premultiplied by alpha.
60 ]]
61 }
62 get {
63 [[Retrieves the general/main color of the given Evas object.
64
65 Retrieves the main color's RGB component (and alpha channel)
66 values, which range from 0 to 255. For the alpha channel,
67 which defines the object's transparency level, 0 means totally
68 transparent, while 255 means opaque. These color values are
69 premultiplied by the alpha value.
70
71 Usually youll use this attribute for text and rectangle objects,
72 where the main color is their unique one. If set for objects
73 which themselves have colors, like the images one, those colors
74 get modulated by this one.
75
76 All newly created Evas rectangles get the default color
77 values of 255 255 255 255 (opaque white).
78
79 Use null pointers on the components you're not interested
80 in: they'll be ignored by the function.
81
82 See the full \@ref Example_Evas_Object_Manipulation "example".
83 ]]
84 }
85 values {
86 r: int; [[The red component of the given color.]]
87 g: int; [[The green component of the given color.]]
88 b: int; [[The blue component of the given color.]]
89 a: int; [[The alpha component of the given color.]]
90 }
91 }
92 @property visible { 52 @property visible {
93 [[The visibility of a canvas object. 53 [[The visibility of a canvas object.
94 54
diff --git a/src/lib/efl/interfaces/efl_gfx_blur.eo b/src/lib/efl/interfaces/efl_gfx_blur.eo
index 7e35ee20e5..c69e7871fb 100644
--- a/src/lib/efl/interfaces/efl_gfx_blur.eo
+++ b/src/lib/efl/interfaces/efl_gfx_blur.eo
@@ -3,7 +3,7 @@ interface Efl.Gfx.Blur
3 [[A simple API to apply blur effects. 3 [[A simple API to apply blur effects.
4 4
5 Those API's might use @Efl.Gfx.Filter internally. It might be necessary to 5 Those API's might use @Efl.Gfx.Filter internally. It might be necessary to
6 also specify the color of the blur with @Efl.Gfx.color. 6 also specify the color of the blur with @Efl.Gfx.Color.color.
7 ]] 7 ]]
8 methods { 8 methods {
9 @property radius { 9 @property radius {
diff --git a/src/lib/efl/interfaces/efl_gfx_buffer.eo b/src/lib/efl/interfaces/efl_gfx_buffer.eo
index 917b4438ba..5df340ba1c 100644
--- a/src/lib/efl/interfaces/efl_gfx_buffer.eo
+++ b/src/lib/efl/interfaces/efl_gfx_buffer.eo
@@ -61,7 +61,7 @@ interface Efl.Gfx.Buffer ()
61 whether or not to use alpha channel data. A value of $true 61 whether or not to use alpha channel data. A value of $true
62 makes it use alpha channel data, and $false makes it ignore 62 makes it use alpha channel data, and $false makes it ignore
63 that data. Note that this has nothing to do with an object's 63 that data. Note that this has nothing to do with an object's
64 color as manipulated by @Efl.Gfx.color.set. 64 color as manipulated by @Efl.Gfx.Color.color.set.
65 ]] 65 ]]
66 } 66 }
67 get { 67 get {
diff --git a/src/lib/efl/interfaces/efl_gfx_color.eo b/src/lib/efl/interfaces/efl_gfx_color.eo
new file mode 100644
index 0000000000..d6e06f2532
--- /dev/null
+++ b/src/lib/efl/interfaces/efl_gfx_color.eo
@@ -0,0 +1,46 @@
1interface Efl.Gfx.Color
2{
3 [[Efl Gfx Color interface class]]
4 methods {
5 @property color @pure_virtual {
6 set {
7 [[Sets the general/main color of the given Evas object to the given
8 one.
9
10 See also @.color.get (for an example)
11
12 These color values are expected to be premultiplied by alpha.
13 ]]
14 }
15 get {
16 [[Retrieves the general/main color of the given Evas object.
17
18 Retrieves the main color's RGB component (and alpha channel)
19 values, which range from 0 to 255. For the alpha channel,
20 which defines the object's transparency level, 0 means totally
21 transparent, while 255 means opaque. These color values are
22 premultiplied by the alpha value.
23
24 Usually youll use this attribute for text and rectangle objects,
25 where the main color is their unique one. If set for objects
26 which themselves have colors, like the images one, those colors
27 get modulated by this one.
28
29 All newly created Evas rectangles get the default color
30 values of 255 255 255 255 (opaque white).
31
32 Use null pointers on the components you're not interested
33 in: they'll be ignored by the function.
34
35 See the full \@ref Example_Evas_Object_Manipulation "example".
36 ]]
37 }
38 values {
39 r: int;
40 g: int;
41 b: int;
42 a: int;
43 }
44 }
45 }
46}
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index af61237416..4c45b95ffd 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -26,6 +26,7 @@
26#include "interfaces/efl_text_markup.eo.c" 26#include "interfaces/efl_text_markup.eo.c"
27 27
28#include "interfaces/efl_gfx.eo.c" 28#include "interfaces/efl_gfx.eo.c"
29#include "interfaces/efl_gfx_color.eo.c"
29#include "interfaces/efl_gfx_buffer.eo.c" 30#include "interfaces/efl_gfx_buffer.eo.c"
30#include "interfaces/efl_gfx_stack.eo.c" 31#include "interfaces/efl_gfx_stack.eo.c"
31#include "interfaces/efl_gfx_fill.eo.c" 32#include "interfaces/efl_gfx_fill.eo.c"
diff --git a/src/lib/elementary/efl_ui_bg_widget.c b/src/lib/elementary/efl_ui_bg_widget.c
index 5c39790706..def31d006f 100644
--- a/src/lib/elementary/efl_ui_bg_widget.c
+++ b/src/lib/elementary/efl_ui_bg_widget.c
@@ -148,7 +148,7 @@ elm_bg_color_set(Evas_Object *obj,
148} 148}
149 149
150EOLIAN static void 150EOLIAN static void
151_efl_ui_bg_widget_efl_gfx_color_set(Eo *obj EINA_UNUSED, Efl_Ui_Bg_Widget_Data *sd, int r, int g, int b, int a) 151_efl_ui_bg_widget_efl_gfx_color_color_set(Eo *obj EINA_UNUSED, Efl_Ui_Bg_Widget_Data *sd, int r, int g, int b, int a)
152{ 152{
153 efl_gfx_color_set(sd->rect, r, g, b, a); 153 efl_gfx_color_set(sd->rect, r, g, b, a);
154} 154}
@@ -164,7 +164,7 @@ elm_bg_color_get(const Evas_Object *obj,
164} 164}
165 165
166EOLIAN static void 166EOLIAN static void
167_efl_ui_bg_widget_efl_gfx_color_get(Eo *obj, Efl_Ui_Bg_Widget_Data *sd, int *r, int *g, int *b, int *a) 167_efl_ui_bg_widget_efl_gfx_color_color_get(Eo *obj, Efl_Ui_Bg_Widget_Data *sd, int *r, int *g, int *b, int *a)
168{ 168{
169 if (!sd->rect) 169 if (!sd->rect)
170 efl_gfx_color_get(efl_super(obj, MY_CLASS), r, g, b, a); 170 efl_gfx_color_get(efl_super(obj, MY_CLASS), r, g, b, a);
diff --git a/src/lib/elementary/efl_ui_bg_widget.eo b/src/lib/elementary/efl_ui_bg_widget.eo
index 2a8cb69729..6bfcf62278 100644
--- a/src/lib/elementary/efl_ui_bg_widget.eo
+++ b/src/lib/elementary/efl_ui_bg_widget.eo
@@ -12,7 +12,7 @@ class Efl.Ui.Bg_Widget (Efl.Ui.Layout, Efl.Ui.Bg, Efl.Image.Load)
12 Efl.Object.constructor; 12 Efl.Object.constructor;
13 Efl.File.file { get; set; } 13 Efl.File.file { get; set; }
14 Efl.File.mmap { get; set; } 14 Efl.File.mmap { get; set; }
15 Efl.Gfx.color { get; set; } 15 Efl.Gfx.Color.color { get; set; }
16 Efl.Image.scale_type { get; set; } 16 Efl.Image.scale_type { get; set; }
17 Efl.Image.Load.load_size { get; set; } 17 Efl.Image.Load.load_size { get; set; }
18 } 18 }
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 35ee4e7c37..a807fa536b 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -696,7 +696,7 @@ _efl_ui_image_efl_canvas_group_group_member_add(Eo *obj, Efl_Ui_Image_Data *sd,
696} 696}
697 697
698EOLIAN static void 698EOLIAN static void
699_efl_ui_image_efl_gfx_color_set(Eo *obj, Efl_Ui_Image_Data *sd, int r, int g, int b, int a) 699_efl_ui_image_efl_gfx_color_color_set(Eo *obj, Efl_Ui_Image_Data *sd, int r, int g, int b, int a)
700{ 700{
701 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_COLOR_SET, 0, r, g, b, a)) 701 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_COLOR_SET, 0, r, g, b, a))
702 return; 702 return;
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index 9a568aed53..4c098c4b45 100644
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -19,8 +19,8 @@ struct Efl.Ui.Image.Error
19} 19}
20 20
21class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable, 21class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
22 Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View, 22 Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View,
23 Efl.Access.Image, Efl.Access.Widget.Action, 23 Efl.Access.Image, Efl.Access.Widget.Action, Efl.Gfx.Color,
24 Efl.Orientation, Efl.Flipable, 24 Efl.Orientation, Efl.Flipable,
25 Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Layout.Calc, 25 Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Layout.Calc,
26 Efl.Layout.Group, Efl.Layout.Signal) 26 Efl.Layout.Group, Efl.Layout.Signal)
@@ -92,7 +92,7 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
92 Efl.Object.constructor; 92 Efl.Object.constructor;
93 Efl.File.file { get; set; } 93 Efl.File.file { get; set; }
94 Efl.File.mmap { set; } 94 Efl.File.mmap { set; }
95 Efl.Gfx.color { set; } 95 Efl.Gfx.Color.color { set; }
96 Efl.Gfx.visible { set; } 96 Efl.Gfx.visible { set; }
97 Efl.Gfx.position { set; } 97 Efl.Gfx.position { set; }
98 Efl.Gfx.size { set; } 98 Efl.Gfx.size { set; }
diff --git a/src/lib/elementary/efl_ui_widget_part_bg.eo b/src/lib/elementary/efl_ui_widget_part_bg.eo
index d624ffcbc9..be56ad1443 100644
--- a/src/lib/elementary/efl_ui_widget_part_bg.eo
+++ b/src/lib/elementary/efl_ui_widget_part_bg.eo
@@ -1,11 +1,11 @@
1class Efl.Ui.Widget.Part_Bg (Efl.Ui.Widget.Part, Efl.Ui.Bg) 1class Efl.Ui.Widget.Part_Bg (Efl.Ui.Widget.Part, Efl.Gfx.Color, Efl.Ui.Bg)
2{ 2{
3 [[Elementary widget internal part background class]] 3 [[Elementary widget internal part background class]]
4 data: null; 4 data: null;
5 implements { 5 implements {
6 Efl.File.file { get; set; } 6 Efl.File.file { get; set; }
7 //Efl.File.mmap { get; set; } 7 //Efl.File.mmap { get; set; }
8 Efl.Gfx.color { set; get; } 8 Efl.Gfx.Color.color { set; get; }
9 Efl.Image.scale_type { get; set; } 9 Efl.Image.scale_type { get; set; }
10 } 10 }
11} 11}
diff --git a/src/lib/elementary/efl_ui_widget_part_shadow.eo b/src/lib/elementary/efl_ui_widget_part_shadow.eo
index 8947b9a0c7..8a73e458b8 100644
--- a/src/lib/elementary/efl_ui_widget_part_shadow.eo
+++ b/src/lib/elementary/efl_ui_widget_part_shadow.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Widget.Part_Shadow (Efl.Ui.Widget.Part, Efl.Gfx, 1class Efl.Ui.Widget.Part_Shadow (Efl.Ui.Widget.Part, Efl.Gfx, Efl.Gfx.Color,
2 Efl.Gfx.Blur, Efl.Gfx.Filter) 2 Efl.Gfx.Blur, Efl.Gfx.Filter)
3{ 3{
4 [[A drop-shadow or glow effect around any widget. 4 [[A drop-shadow or glow effect around any widget.
@@ -22,7 +22,7 @@ class Efl.Ui.Widget.Part_Shadow (Efl.Ui.Widget.Part, Efl.Gfx,
22 ]] 22 ]]
23 data: null; 23 data: null;
24 implements { 24 implements {
25 Efl.Gfx.color { set; get; } 25 Efl.Gfx.Color.color { set; get; }
26 Efl.Gfx.Blur.radius { set; get; } 26 Efl.Gfx.Blur.radius { set; get; }
27 Efl.Gfx.Blur.offset { set; get; } 27 Efl.Gfx.Blur.offset { set; get; }
28 Efl.Gfx.Blur.grow { set; get; } 28 Efl.Gfx.Blur.grow { set; get; }
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index bcb75c9d30..eac6e88ce9 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -7303,7 +7303,7 @@ _efl_ui_win_part_file_get(Eo *obj, Efl_Ui_Win_Data *sd, const char *part, const
7303/* Efl.Part begin */ 7303/* Efl.Part begin */
7304 7304
7305static void 7305static void
7306_efl_ui_win_part_efl_gfx_color_set(Eo *obj, void *_pd EINA_UNUSED, int r, int g, int b, int a) 7306_efl_ui_win_part_efl_gfx_color_color_set(Eo *obj, void *_pd EINA_UNUSED, int r, int g, int b, int a)
7307{ 7307{
7308 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 7308 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
7309 Efl_Ui_Win_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS); 7309 Efl_Ui_Win_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS);
@@ -7315,7 +7315,7 @@ _efl_ui_win_part_efl_gfx_color_set(Eo *obj, void *_pd EINA_UNUSED, int r, int g,
7315} 7315}
7316 7316
7317static void 7317static void
7318_efl_ui_win_part_efl_gfx_color_get(Eo *obj, void *_pd EINA_UNUSED, int *r, int *g, int *b, int *a) 7318_efl_ui_win_part_efl_gfx_color_color_get(Eo *obj, void *_pd EINA_UNUSED, int *r, int *g, int *b, int *a)
7319{ 7319{
7320 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 7320 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
7321 Efl_Ui_Win_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS); 7321 Efl_Ui_Win_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS);
diff --git a/src/lib/elementary/efl_ui_win_part.eo b/src/lib/elementary/efl_ui_win_part.eo
index 67fd3224c9..380929c12e 100644
--- a/src/lib/elementary/efl_ui_win_part.eo
+++ b/src/lib/elementary/efl_ui_win_part.eo
@@ -1,11 +1,12 @@
1class Efl.Ui.Win.Part (Efl.Ui.Widget.Part, Efl.Content, Efl.Gfx, Efl.File) 1class Efl.Ui.Win.Part (Efl.Ui.Widget.Part, Efl.Content, Efl.Gfx, Efl.Gfx.Color,
2 Efl.File)
2{ 3{
3 [[Efl UI window interal part class]] 4 [[Efl UI window interal part class]]
4 data: null; 5 data: null;
5 implements { 6 implements {
6 Efl.Content.content { get; set; } 7 Efl.Content.content { get; set; }
7 Efl.Content.content_unset; 8 Efl.Content.content_unset;
8 Efl.Gfx.color { get; set; } 9 Efl.Gfx.Color.color { get; set; }
9 Efl.File.file { get; set; } 10 Efl.File.file { get; set; }
10 } 11 }
11} 12}
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 33a6845484..61dc2c5c57 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -886,7 +886,7 @@ _elm_widget_efl_gfx_visible_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool vi
886} 886}
887 887
888EOLIAN static void 888EOLIAN static void
889_elm_widget_efl_gfx_color_set(Eo *obj, Elm_Widget_Smart_Data *pd, int r, int g, int b, int a) 889_elm_widget_efl_gfx_color_color_set(Eo *obj, Elm_Widget_Smart_Data *pd, int r, int g, int b, int a)
890{ 890{
891 Eina_Iterator *it; 891 Eina_Iterator *it;
892 Evas_Object *o; 892 Evas_Object *o;
@@ -5780,7 +5780,7 @@ _efl_ui_widget_part_shadow_efl_gfx_blur_radius_get(Eo *obj, void *_pd EINA_UNUSE
5780} 5780}
5781 5781
5782EOLIAN static void 5782EOLIAN static void
5783_efl_ui_widget_part_shadow_efl_gfx_color_set(Eo *obj, void *_pd EINA_UNUSED, int r, int g, int b, int a) 5783_efl_ui_widget_part_shadow_efl_gfx_color_color_set(Eo *obj, void *_pd EINA_UNUSED, int r, int g, int b, int a)
5784{ 5784{
5785 Widget_Shadow *shadow = _widget_shadow_part_get(obj); 5785 Widget_Shadow *shadow = _widget_shadow_part_get(obj);
5786 shadow->props.r = r; 5786 shadow->props.r = r;
@@ -5791,7 +5791,7 @@ _efl_ui_widget_part_shadow_efl_gfx_color_set(Eo *obj, void *_pd EINA_UNUSED, int
5791} 5791}
5792 5792
5793EOLIAN static void 5793EOLIAN static void
5794_efl_ui_widget_part_shadow_efl_gfx_color_get(Eo *obj, void *_pd EINA_UNUSED, int *r, int *g, int *b, int *a) 5794_efl_ui_widget_part_shadow_efl_gfx_color_color_get(Eo *obj, void *_pd EINA_UNUSED, int *r, int *g, int *b, int *a)
5795{ 5795{
5796 Widget_Shadow *shadow = _widget_shadow_part_get(obj); 5796 Widget_Shadow *shadow = _widget_shadow_part_get(obj);
5797 if (r) *r = shadow->props.r; 5797 if (r) *r = shadow->props.r;
@@ -5956,7 +5956,7 @@ _efl_ui_widget_part_bg_efl_file_file_get(Eo *obj, void *pd EINA_UNUSED, const ch
5956} 5956}
5957 5957
5958EOLIAN static void 5958EOLIAN static void
5959_efl_ui_widget_part_bg_efl_gfx_color_set(Eo *obj, void *pd EINA_UNUSED, int r, int g, int b, int a) 5959_efl_ui_widget_part_bg_efl_gfx_color_color_set(Eo *obj, void *pd EINA_UNUSED, int r, int g, int b, int a)
5960{ 5960{
5961 Evas_Object *bg_obj = efl_ui_widget_part_bg_get(obj); 5961 Evas_Object *bg_obj = efl_ui_widget_part_bg_get(obj);
5962 5962
@@ -5964,7 +5964,7 @@ _efl_ui_widget_part_bg_efl_gfx_color_set(Eo *obj, void *pd EINA_UNUSED, int r, i
5964} 5964}
5965 5965
5966EOLIAN static void 5966EOLIAN static void
5967_efl_ui_widget_part_bg_efl_gfx_color_get(Eo *obj, void *pd EINA_UNUSED, int *r, int *g, int *b, int *a) 5967_efl_ui_widget_part_bg_efl_gfx_color_color_get(Eo *obj, void *pd EINA_UNUSED, int *r, int *g, int *b, int *a)
5968{ 5968{
5969 Evas_Object *bg_obj = efl_ui_widget_part_bg_get(obj); 5969 Evas_Object *bg_obj = efl_ui_widget_part_bg_get(obj);
5970 5970
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index b8c093af06..a3bf4f1ca6 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -580,7 +580,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access,
580 Efl.Object.destructor; 580 Efl.Object.destructor;
581 Efl.Object.provider_find; 581 Efl.Object.provider_find;
582 Efl.Object.debug_name_override; 582 Efl.Object.debug_name_override;
583 Efl.Gfx.color { set; } 583 Efl.Gfx.Color.color { set; }
584 Efl.Gfx.visible { set; } 584 Efl.Gfx.visible { set; }
585 Efl.Gfx.position { set; } 585 Efl.Gfx.position { set; }
586 Efl.Gfx.size { set; } 586 Efl.Gfx.size { set; }
diff --git a/src/lib/evas/canvas/efl_canvas_group.eo b/src/lib/evas/canvas/efl_canvas_group.eo
index 77bfecf3c1..4b0477d891 100644
--- a/src/lib/evas/canvas/efl_canvas_group.eo
+++ b/src/lib/evas/canvas/efl_canvas_group.eo
@@ -129,7 +129,7 @@ class Efl.Canvas.Group (Efl.Canvas.Object)
129 Efl.Object.constructor; 129 Efl.Object.constructor;
130 Efl.Object.destructor; 130 Efl.Object.destructor;
131 Efl.Object.debug_name_override; 131 Efl.Object.debug_name_override;
132 Efl.Gfx.color { set; } 132 Efl.Gfx.Color.color { set; }
133 Efl.Gfx.visible { set; } 133 Efl.Gfx.visible { set; }
134 Efl.Gfx.position { set; } 134 Efl.Gfx.position { set; }
135 Efl.Canvas.Object.clip { set; } 135 Efl.Canvas.Object.clip { set; }
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index e6af97e97f..30a39b4be8 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -1,7 +1,7 @@
1import efl_text_types; 1import efl_text_types;
2import efl_animation_types; 2import efl_animation_types;
3 3
4abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator, 4abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Animator,
5 Efl.Input.Interface, Efl.Gfx.Size.Hint, 5 Efl.Input.Interface, Efl.Gfx.Size.Hint,
6 Efl.Gfx.Map, Efl.Loop.Consumer, Efl.Ui.Base, Efl.Canvas.Pointer) 6 Efl.Gfx.Map, Efl.Loop.Consumer, Efl.Ui.Base, Efl.Canvas.Pointer)
7{ 7{
@@ -598,7 +598,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
598 Efl.Object.del; 598 Efl.Object.del;
599 Efl.Object.debug_name_override; 599 Efl.Object.debug_name_override;
600 Efl.Gfx.visible { get; set; } 600 Efl.Gfx.visible { get; set; }
601 Efl.Gfx.color { get; set; } 601 Efl.Gfx.Color.color { get; set; }
602 Efl.Gfx.geometry { get; set; } 602 Efl.Gfx.geometry { get; set; }
603 Efl.Gfx.position { get; set; } 603 Efl.Gfx.position { get; set; }
604 Efl.Gfx.size { get; set; } 604 Efl.Gfx.size { get; set; }
diff --git a/src/lib/evas/canvas/efl_vg.eo b/src/lib/evas/canvas/efl_vg.eo
index 54ed2d9bbd..ca145301ec 100644
--- a/src/lib/evas/canvas/efl_vg.eo
+++ b/src/lib/evas/canvas/efl_vg.eo
@@ -1,6 +1,6 @@
1import eina_types; 1import eina_types;
2 2
3abstract Efl.VG (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Duplicate) 3abstract Efl.VG (Efl.Object, Efl.Gfx, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Duplicate)
4{ 4{
5 [[Efl vector graphics abstract class]] 5 [[Efl vector graphics abstract class]]
6 eo_prefix: efl_vg; 6 eo_prefix: efl_vg;
@@ -109,7 +109,7 @@ abstract Efl.VG (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Duplicate)
109 Efl.Object.constructor; 109 Efl.Object.constructor;
110 Efl.Object.destructor; 110 Efl.Object.destructor;
111 Efl.Gfx.visible { get; set; } 111 Efl.Gfx.visible { get; set; }
112 Efl.Gfx.color { get; set; } 112 Efl.Gfx.Color.color { get; set; }
113 Efl.Gfx.size { get; } 113 Efl.Gfx.size { get; }
114 Efl.Gfx.position { get; set; } 114 Efl.Gfx.position { get; set; }
115 Efl.Gfx.geometry { get; } 115 Efl.Gfx.geometry { get; }
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index b8d2a0a333..2be420a409 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -2128,7 +2128,7 @@ evas_object_color_set(Evas_Object *obj, int r, int g, int b, int a)
2128} 2128}
2129 2129
2130EOLIAN static void 2130EOLIAN static void
2131_efl_canvas_object_efl_gfx_color_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, 2131_efl_canvas_object_efl_gfx_color_color_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
2132 int r, int g, int b, int a) 2132 int r, int g, int b, int a)
2133{ 2133{
2134 int prev_a; 2134 int prev_a;
@@ -2175,7 +2175,7 @@ evas_object_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a)
2175} 2175}
2176 2176
2177EOLIAN static void 2177EOLIAN static void
2178_efl_canvas_object_efl_gfx_color_get(Eo *eo_obj EINA_UNUSED, 2178_efl_canvas_object_efl_gfx_color_color_get(Eo *eo_obj EINA_UNUSED,
2179 Evas_Object_Protected_Data *obj, 2179 Evas_Object_Protected_Data *obj,
2180 int *r, int *g, int *b, int *a) 2180 int *r, int *g, int *b, int *a)
2181{ 2181{
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 3f4dab57a9..f5f5c25fe9 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -845,7 +845,7 @@ _efl_canvas_group_efl_canvas_object_no_render_set(Eo *eo_obj, Evas_Smart_Data *o
845} 845}
846 846
847EOLIAN static void 847EOLIAN static void
848_efl_canvas_group_efl_gfx_color_set(Eo *eo_obj, Evas_Smart_Data *o, int r, int g, int b, int a) 848_efl_canvas_group_efl_gfx_color_color_set(Eo *eo_obj, Evas_Smart_Data *o, int r, int g, int b, int a)
849{ 849{
850 if (_evas_object_intercept_call(eo_obj, EVAS_OBJECT_INTERCEPT_CB_COLOR_SET, 0, r, g, b, a)) 850 if (_evas_object_intercept_call(eo_obj, EVAS_OBJECT_INTERCEPT_CB_COLOR_SET, 0, r, g, b, a))
851 return; 851 return;
diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index e6af1ee8dc..e5883e465a 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -118,7 +118,7 @@ _efl_vg_efl_gfx_visible_get(Eo *obj EINA_UNUSED,
118} 118}
119 119
120static void 120static void
121_efl_vg_efl_gfx_color_set(Eo *obj EINA_UNUSED, 121_efl_vg_efl_gfx_color_color_set(Eo *obj EINA_UNUSED,
122 Efl_VG_Data *pd, 122 Efl_VG_Data *pd,
123 int r, int g, int b, int a) 123 int r, int g, int b, int a)
124{ 124{
@@ -155,7 +155,7 @@ _efl_vg_efl_gfx_color_set(Eo *obj EINA_UNUSED,
155} 155}
156 156
157static void 157static void
158_efl_vg_efl_gfx_color_get(Eo *obj EINA_UNUSED, 158_efl_vg_efl_gfx_color_color_get(Eo *obj EINA_UNUSED,
159 Efl_VG_Data *pd, 159 Efl_VG_Data *pd,
160 int *r, int *g, int *b, int *a) 160 int *r, int *g, int *b, int *a)
161{ 161{