forked from enlightenment/efl
value can't be < 0 and > 255 at the same time
SVN revision: 45380
This commit is contained in:
parent
e7e2fb4bc5
commit
7c3f53b364
|
@ -425,13 +425,13 @@ edje_color_class_set(const char *color_class, int r, int g, int b, int a, int r2
|
||||||
}
|
}
|
||||||
|
|
||||||
if (r < 0) r = 0;
|
if (r < 0) r = 0;
|
||||||
if (r > 255) r = 255;
|
else if (r > 255) r = 255;
|
||||||
if (g < 0) g = 0;
|
if (g < 0) g = 0;
|
||||||
if (g > 255) g = 255;
|
else if (g > 255) g = 255;
|
||||||
if (b < 0) b = 0;
|
if (b < 0) b = 0;
|
||||||
if (b > 255) b = 255;
|
else if (b > 255) b = 255;
|
||||||
if (a < 0) a = 0;
|
if (a < 0) a = 0;
|
||||||
if (a > 255) a = 255;
|
else if (a > 255) a = 255;
|
||||||
if ((cc->r == r) && (cc->g == g) &&
|
if ((cc->r == r) && (cc->g == g) &&
|
||||||
(cc->b == b) && (cc->a == a) &&
|
(cc->b == b) && (cc->a == a) &&
|
||||||
(cc->r2 == r2) && (cc->g2 == g2) &&
|
(cc->r2 == r2) && (cc->g2 == g2) &&
|
||||||
|
@ -655,13 +655,13 @@ edje_object_color_class_set(Evas_Object *obj, const char *color_class, int r, in
|
||||||
ed = _edje_fetch(obj);
|
ed = _edje_fetch(obj);
|
||||||
if ((!ed) || (!color_class)) return EINA_FALSE;
|
if ((!ed) || (!color_class)) return EINA_FALSE;
|
||||||
if (r < 0) r = 0;
|
if (r < 0) r = 0;
|
||||||
if (r > 255) r = 255;
|
else if (r > 255) r = 255;
|
||||||
if (g < 0) g = 0;
|
if (g < 0) g = 0;
|
||||||
if (g > 255) g = 255;
|
else if (g > 255) g = 255;
|
||||||
if (b < 0) b = 0;
|
if (b < 0) b = 0;
|
||||||
if (b > 255) b = 255;
|
else if (b > 255) b = 255;
|
||||||
if (a < 0) a = 0;
|
if (a < 0) a = 0;
|
||||||
if (a > 255) a = 255;
|
else if (a > 255) a = 255;
|
||||||
EINA_LIST_FOREACH(ed->color_classes, l, cc)
|
EINA_LIST_FOREACH(ed->color_classes, l, cc)
|
||||||
{
|
{
|
||||||
if ((cc->name) && (!strcmp(cc->name, color_class)))
|
if ((cc->name) && (!strcmp(cc->name, color_class)))
|
||||||
|
|
Loading…
Reference in New Issue