Enlightenment CVS committal

Author  : moom
Project : e17
Module  : libs/evas

Dir     : e17/libs/evas/src/lib/canvas


Modified Files:
        evas_object_textblock.c 


Log Message:
* The textblock object now gets its color multiplied by the color of its
clip object.


===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_object_textblock.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -3 -r1.126 -r1.127
--- evas_object_textblock.c     1 Mar 2006 03:48:02 -0000       1.126
+++ evas_object_textblock.c     11 May 2006 12:55:04 -0000      1.127
@@ -4016,16 +4016,16 @@
      }
 #define COLOR_SET(col) \
        ENFN->context_color_set(output, context, \
-                               it->format->color.col.r, \
-                               it->format->color.col.g, \
-                               it->format->color.col.b, \
-                               it->format->color.col.a);
+                               (obj->cur.cache.clip.r * 
it->format->color.col.r) / 255, \
+                               (obj->cur.cache.clip.g * 
it->format->color.col.g) / 255, \
+                               (obj->cur.cache.clip.b * 
it->format->color.col.b) / 255, \
+                               (obj->cur.cache.clip.a * 
it->format->color.col.a) / 255);
 #define COLOR_SET_AMUL(col, amul) \
        ENFN->context_color_set(output, context, \
-                               it->format->color.col.r, \
-                               it->format->color.col.g, \
-                               it->format->color.col.b, \
-                               ((int)it->format->color.col.a * (amul)) / 255);
+                               (obj->cur.cache.clip.r * 
it->format->color.col.r) / 255, \
+                               (obj->cur.cache.clip.g * 
it->format->color.col.g) / 255, \
+                               (obj->cur.cache.clip.b * 
it->format->color.col.b) / 255, \
+                               (obj->cur.cache.clip.a * 
it->format->color.col.a * (amul)) / 65025);
 #define DRAW_TEXT(ox, oy) \
    if (it->format->font.font) ENFN->font_draw(output, context, surface, 
it->format->font.font, \
                                                 obj->cur.cache.geometry.x + 
ln->x + it->x - it->inset + x + (ox), \




-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to