Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_calc.c edje_text.c
Log Message:
same as previous commit.
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- edje_calc.c 25 Sep 2006 23:05:30 -0000 1.89
+++ edje_calc.c 30 Sep 2006 10:18:31 -0000 1.90
@@ -1198,7 +1198,11 @@
{
evas_object_move(ep->object, ed->x + p3.x, ed->y + p3.y);
evas_object_resize(ep->object, p3.w, p3.h);
- evas_object_color_set(ep->object, p3.color.r, p3.color.g,
p3.color.b, p3.color.a);
+ evas_object_color_set(ep->object,
+ (p3.color.r * p3.color.a) / 255,
+ (p3.color.g * p3.color.a) / 255,
+ (p3.color.b * p3.color.a) / 255,
+ p3.color.a);
if (p3.visible) evas_object_show(ep->object);
else evas_object_hide(ep->object);
}
@@ -1267,7 +1271,11 @@
printf("Error type: EVAS_LOAD_ERROR_UNKNOWN_FORMAT\n");
}
}
- evas_object_color_set(ep->object, p3.color.r, p3.color.g,
p3.color.b, p3.color.a);
+ evas_object_color_set(ep->object,
+ (p3.color.r * p3.color.a) / 255,
+ (p3.color.g * p3.color.a) / 255,
+ (p3.color.b * p3.color.a) / 255,
+ p3.color.a);
if (p3.visible) evas_object_show(ep->object);
else evas_object_hide(ep->object);
}
@@ -1285,12 +1293,16 @@
{
evas_object_move(ep->object, ed->x + p3.x, ed->y + p3.y);
evas_object_resize(ep->object, p3.w, p3.h);
- evas_object_color_set(ep->object, p3.color.r, p3.color.g,
p3.color.b, p3.color.a);
+ evas_object_color_set(ep->object,
+ (p3.color.r * p3.color.a) / 255,
+ (p3.color.g * p3.color.a) / 255,
+ (p3.color.b * p3.color.a) / 255,
+ p3.color.a);
if (p3.visible) evas_object_show(ep->object);
else evas_object_hide(ep->object);
evas_object_gradient_angle_set(ep->object, p3.fill.angle);
- evas_object_gradient_spread_set(ep->object, p3.fill.spread);
+ evas_object_gradient_fill_spread_set(ep->object, p3.fill.spread);
evas_object_gradient_fill_set(ep->object, p3.fill.x, p3.fill.y,
p3.fill.w, p3.fill.h);
if (p3.gradient.type && p3.gradient.type[0])
@@ -1305,11 +1317,15 @@
if (se)
{
// XXX only do this if we NEED to (e.g. gradient changed)
- evas_object_gradient_colors_clear(ep->object);
+ evas_object_gradient_clear(ep->object);
for (l = se->color_list; l; l = l->next)
{
Edje_Spectrum_Color *sc = l->data;
- evas_object_gradient_color_add(ep->object, sc->r,
sc->g, sc->b, sc->a, sc->d);
+ evas_object_gradient_color_stop_add(ep->object,
+ (sc->r * sc->a)
/ 255,
+ (sc->g * sc->a)
/ 255,
+ (sc->b * sc->a)
/ 255,
+ sc->a, sc->d);
}
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
