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

Efl.Gfx.Color_Class: move color_class_code{} to color_class intf. 

Ideally it should have belong to color_class interface from beginning.
This commit is contained in:
Amitesh Singh 2018-01-16 14:16:23 +09:00
parent d18de6b1b8
commit 62b3813ae4
7 changed files with 67 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/lib/edje/edje_util.c
View File

@ -4,6 +4,8 @@
#include "../evas/canvas/evas_line.eo.h"
#include "../evas/canvas/evas_text.eo.h"
#include "../efl/interfaces/efl_gfx_color_internal.h"
typedef struct _Edje_Box_Layout Edje_Box_Layout;
struct _Edje_Box_Layout
{
@ -998,6 +1000,29 @@ _efl_canvas_layout_efl_gfx_color_class_color_class_clear(Eo *obj EINA_UNUSED, Ed
}
}
EOLIAN void
_efl_canvas_layout_efl_gfx_color_class_color_class_code_set(Eo *obj, Edje *pd EINA_UNUSED, const char *color_class,
Efl_Gfx_Color_Class_Layer layer, const char *colorcode)
{
int len;
unsigned char r, g, b, a;
len = _gfx_color_format_clean_param(colorcode);
_gfx_color_format_color_parse(colorcode, len, &r, &g, &b, &a);
efl_gfx_color_class_set(obj, color_class, layer, r, g, b, a);
}
EOLIAN const char *
_efl_canvas_layout_efl_gfx_color_class_color_class_code_get(Eo *obj, Edje *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);
}
typedef struct _Edje_File_Color_Class_Iterator Edje_File_Color_Class_Iterator;
struct _Edje_File_Color_Class_Iterator
{

1
src/lib/edje/efl_canvas_layout.eo
View File

@ -102,6 +102,7 @@ class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
Efl.Gfx.Color_Class.color_class_description { get; }
Efl.Gfx.Color_Class.color_class_del;
Efl.Gfx.Color_Class.color_class_clear;
Efl.Gfx.Color_Class.color_class_code { get; set; }
Efl.Gfx.Text_Class.text_class { get; set; }
Efl.Gfx.Text_Class.text_class_del;
Efl.Gfx.Size_Class.size_class { get; set; }

43
src/lib/efl/interfaces/efl_gfx_color.c
View File

@ -2,31 +2,13 @@
#include "Efl.h"
#include "efl_gfx_color_internal.h"
static int
_format_clean_param(Eina_Tmpstr *s)
{
Eina_Tmpstr *ss;
char *ds;
int len = 0;
ds = (char*) s;
for (ss = s; *ss; ss++, ds++, len++)
{
if ((*ss == '\\') && *(ss + 1)) ss++;
if (ds != ss) *ds = *ss;
}
*ds = 0;
return len;
}
EOLIAN static void
_efl_gfx_color_color_code_set(Eo *obj, void *_pd EINA_UNUSED, const char *colorcode)
{
int len;
unsigned char r, g, b, a;
len = _format_clean_param(colorcode);
len = _gfx_color_format_clean_param(colorcode);
_gfx_color_format_color_parse(colorcode, len, &r, &g, &b, &a);
efl_gfx_color_set(obj, r, g, b, a);
@ -41,27 +23,4 @@ _efl_gfx_color_color_code_get(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,
Efl_Gfx_Color_Class_Layer layer, const char *colorcode)
{
int len;
unsigned char r, g, b, a;
len = _format_clean_param(colorcode);
_gfx_color_format_color_parse(colorcode, len, &r, &g, &b, &a);
efl_gfx_color_class_set(obj, color_class, layer, r, g, b, a);
}
EOLIAN static const char *
_efl_gfx_color_color_class_code_get(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);
}
#include "interfaces/efl_gfx_color.eo.c"

19
src/lib/efl/interfaces/efl_gfx_color.eo
View File

@ -60,24 +60,5 @@ mixin Efl.Gfx.Color
colorcode: string; [[the hex color code.]]
}
}
@property color_class_code {
set {
[[Set the color class color of given Evas Object to the given hex color code(#RRGGBBAA).
e.g. efl_gfx_color_class_code_set(obj, "color_class_name", layer, "#FFCCAACC");
]]
}
get {
[[Get hex color class code of given Evas Object.
This returns a short lived hex color class code string.
]]
}
keys {
color_class: string; [[The name of color class]]
layer: Efl.Gfx.Color_Class.Layer @optional; [[The layer to set the color]]
}
values {
colorcode: string; [[the hex color code.]]
}
}
}
}

19
src/lib/efl/interfaces/efl_gfx_color_class.eo
View File

@ -82,5 +82,24 @@ interface Efl.Gfx.Color_Class
@since 1.17.0]]
}
@property color_class_code {
set {
[[Set the color class color of given Evas Object to the given hex color code(#RRGGBBAA).
e.g. efl_gfx_color_class_code_set(obj, "color_class_name", layer, "#FFCCAACC");
]]
}
get {
[[Get hex color class code of given Evas Object.
This returns a short lived hex color class code string.
]]
}
keys {
color_class: string; [[The name of color class]]
layer: Efl.Gfx.Color_Class.Layer @optional; [[The layer to set the color]]
}
values {
colorcode: string; [[the hex color code.]]
}
}
}
}

20
src/lib/efl/interfaces/efl_gfx_color_internal.c
View File

@ -1,5 +1,23 @@
#include "efl_gfx_color_internal.h"
EAPI int
_gfx_color_format_clean_param(Eina_Tmpstr *s)
{
Eina_Tmpstr *ss;
char *ds;
int len = 0;
ds = (char*) s;
for (ss = s; *ss; ss++, ds++, len++)
{
if ((*ss == '\\') && *(ss + 1)) ss++;
if (ds != ss) *ds = *ss;
}
*ds = 0;
return len;
}
static int
_hex_string_get(char ch, Eina_Bool *ok)
{
@ -25,7 +43,7 @@ _hex_string_get(char ch, Eina_Bool *ok)
* @param[out] b The Blue value - NOT NULL.
* @param[out] a The Alpha value - NOT NULL.
*/
Eina_Bool
EAPI Eina_Bool
_gfx_color_format_color_parse(const char *str, int slen,
unsigned char *r, unsigned char *g,
unsigned char *b, unsigned char *a)

3
src/lib/efl/interfaces/efl_gfx_color_internal.h
View File

@ -3,6 +3,7 @@
#include <Eina.h>
Eina_Bool _gfx_color_format_color_parse(const char *str, int slen, unsigned char *r, unsigned char *g, unsigned char *b, unsigned char *a);
EAPI int _gfx_color_format_clean_param(Eina_Tmpstr *s);
EAPI Eina_Bool _gfx_color_format_color_parse(const char *str, int slen, unsigned char *r, unsigned char *g, unsigned char *b, unsigned char *a);
#endif