efl_gfx_color_class: make this a mixin and move color_class_code here

Summary:
color_class_code seems to only have been added to efl_gfx_color in order to
share the hex conversion code, but this is trivial to do when it's in another
class and makes the api more sensible

ref T7559

Reviewers: segfaultxavi, bu5hm4n, cedric

Reviewed By: segfaultxavi

Subscribers: #reviewers, #committers

Tags: #efl_api

Maniphest Tasks: T7559

Differential Revision: https://phab.enlightenment.org/D7898

1 files changed, 8 insertions, 6 deletions

diff --git a/src/lib/efl/interfaces/efl_gfx_color.c b/src/lib/efl/interfaces/efl_gfx_color.c
index 54c4df8..92c1f07 100644
--- a/src/lib/efl/interfaces/efl_gfx_color.c
+++ b/src/lib/efl/interfaces/efl_gfx_color.c
@@ -117,8 +117,8 @@ _efl_gfx_color_color_code_get(const Eo *obj, void *_pd EINA_UNUSED)
     return eina_slstr_printf("#%02X%02X%02X%02X", r, g, b, a);
 }
 
-EOLIAN static void
-_efl_gfx_color_color_class_code_set(Eo *obj, void *_pd EINA_UNUSED, const char *color_class,
+EOLIAN static Eina_Bool
+_efl_gfx_color_class_color_class_code_set(Eo *obj, void *_pd EINA_UNUSED, const char *color_class,
                                     Efl_Gfx_Color_Class_Layer layer, const char *colorcode)
 {
    int len;
@@ -127,17 +127,19 @@ _efl_gfx_color_color_class_code_set(Eo *obj, void *_pd EINA_UNUSED, const char *
    len = _format_clean_param(colorcode);
 
    _format_color_parse(colorcode, len, &r, &g, &b, &a);
-   efl_gfx_color_class_set(obj, color_class, layer, r, g, b, a);
+   return efl_gfx_color_class_set(obj, color_class, layer, r, g, b, a);
 }
 
 EOLIAN static const char *
-_efl_gfx_color_color_class_code_get(const Eo *obj EINA_UNUSED, void *pd EINA_UNUSED,
+_efl_gfx_color_class_color_class_code_get(const Eo *obj EINA_UNUSED, void *pd EINA_UNUSED,
                                     const char *color_class, Efl_Gfx_Color_Class_Layer layer)
 {
    int r, g, b, a;
 
-   efl_gfx_color_class_get(obj, color_class, layer, &r, &g, &b, &a);
-   return eina_slstr_printf("#%02X%02X%02X%02X", r, g, b, a);
+   if (efl_gfx_color_class_get(obj, color_class, layer, &r, &g, &b, &a))
+     return eina_slstr_printf("#%02X%02X%02X%02X", r, g, b, a);
+   return NULL;
 }
 
 #include "interfaces/efl_gfx_color.eo.c"
+#include "interfaces/efl_gfx_color_class.eo.c"