Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_calc.c
Log Message:
DONT set color - bad. see comments
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -3 -r1.106 -r1.107
--- edje_calc.c 8 Jul 2007 17:52:39 -0000 1.106
+++ edje_calc.c 1 Aug 2007 14:34:10 -0000 1.107
@@ -1325,7 +1325,8 @@
if (p3.visible) evas_object_show(ep->object);
else evas_object_hide(ep->object);
}
- else if (ep->part->type == EDJE_PART_TYPE_SWALLOW || ep->part->type ==
EDJE_PART_TYPE_GROUP)
+ else if ((ep->part->type == EDJE_PART_TYPE_SWALLOW) ||
+ (ep->part->type == EDJE_PART_TYPE_GROUP))
{
evas_object_move(ep->object, ed->x + p3.x, ed->y + p3.y);
evas_object_resize(ep->object, p3.w, p3.h);
@@ -1379,12 +1380,15 @@
if (ep->swallowed_object)
{
- evas_object_color_set(ep->swallowed_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);
-
+//// the below really is wrong - swallow color shouldnt affect swallowed object
+//// color - the edje color as a WHOLE should though - and that should be
+//// done via the clipper anyway. this created bugs when objects had their
+//// colro set and were swallowed - then had their color changed.
+// evas_object_color_set(ep->swallowed_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);
evas_object_move(ep->swallowed_object, ed->x + p3.x, ed->y + p3.y);
evas_object_resize(ep->swallowed_object, p3.w, p3.h);
if (p3.visible) evas_object_show(ep->swallowed_object);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
