enlightenment/terminology
enlightenment
/
terminology
9
6
Fork 7
Code Issues 7 Pull Requests Projects Releases Wiki Activity

color class: ensure operations work

This commit is contained in:
Boris Faure 2020-11-15 12:27:40 +01:00
parent 11abaaa0b4
commit 7881e66b98
Signed by: borisfaure
GPG Key ID: 35C0410516166BE8
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/colors.c
View File

@ -538,16 +538,24 @@ color_scheme_apply(Evas_Object *edje,
EINA_SAFETY_ON_NULL_RETURN(cs);
#define CS_SET(_K, _F) do {\
edje_object_color_class_set(edje, _K, \
if (edje_object_color_class_set(edje, _K, \
cs->_F.r, cs->_F.g, cs->_F.b, cs->_F.a, \
cs->_F.r, cs->_F.g, cs->_F.b, cs->_F.a, \
cs->_F.r, cs->_F.g, cs->_F.b, cs->_F.a); \
cs->_F.r, cs->_F.g, cs->_F.b, cs->_F.a) \
!= EINA_TRUE) \
{ \
ERR("error setting color class '%s' on object %p", _K, edje); \
} \
} while (0)
#define CS_SET_MANY(_K, _F1, _F2, _F3) do { \
edje_object_color_class_set(edje, _K, \
if (edje_object_color_class_set(edje, _K, \
cs->_F1.r, cs->_F1.g, cs->_F1.b, cs->_F1.a, \
cs->_F2.r, cs->_F2.g, cs->_F2.b, cs->_F2.a, \
cs->_F3.r, cs->_F3.g, cs->_F3.b, cs->_F3.a); \
cs->_F3.r, cs->_F3.g, cs->_F3.b, cs->_F3.a) \
!= EINA_TRUE) \
{ \
ERR("error setting color class '%s' on object %p", _K, edje); \
} \
} while (0)
CS_SET("BG", bg);

11
src/bin/termptyesc.c
View File

@ -4175,9 +4175,9 @@ _handle_xterm_set_color_class(Termpty *ty, Eina_Unicode *p, int len,
if (edje_object_color_class_get(obj, color_class, &r, &g, &b, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL) != 0)
NULL, NULL, NULL, NULL) != EINA_TRUE)
{
ERR("error getting color class '%s'", color_class);
ERR("error getting color class '%s' on obj %p", color_class, obj);
}
l = snprintf(buf, sizeof(buf),
"\033]%d;rgb:%.2x%.2x/%.2x%.2x/%.2x%.2x\007",
@ -4189,10 +4189,13 @@ _handle_xterm_set_color_class(Termpty *ty, Eina_Unicode *p, int len,
unsigned char r, g, b;
if (_xterm_parse_color(ty, &p, &r, &g, &b, len) < 0)
goto err;
edje_object_color_class_set(obj, color_class,
if (edje_object_color_class_set(obj, color_class,
r, g, b, 0xff,
r, g, b, 0xff,
r, g, b, 0xff);
r, g, b, 0xff) != EINA_TRUE)
{
ERR("error setting color class '%s' on obj %p", color_class, obj);
}
}
return;