Enlightenment CVS committal

Author  : raster
Project : e17
Module  : proto

Dir     : e17/proto/esmart/src/container


Modified Files:
        container.c container.h container_smart.c 


Log Message:


Oystein's patch :)

===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/esmart/src/container/container.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- container.c 18 Oct 2003 19:18:31 -0000      1.5
+++ container.c 5 Nov 2003 00:11:04 -0000       1.6
@@ -351,6 +351,7 @@
   double L; // length of all objects at original size (for nonhomog)
   int num; // number of elements
   double error = 0;
+  int r,g,b;
 
   /* FIXME: add a 'changed' flag to prevent excessive recalcs */
   
@@ -377,6 +378,13 @@
 
   L = _container_elements_orig_length_get(cont);
   num = evas_list_count(cont->elements);
+  
+  
+  evas_object_color_get(cont->clipper, &r, &g, &b, NULL);
+  if(num > 0)
+         evas_object_color_set(cont->clipper, r,g,b, cont->clipper_orig_alpha);
+  else
+         evas_object_color_set(cont->clipper, r,g,b, 0);
 
   for (l = cont->elements; l; l = l->next)
   {
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/esmart/src/container/container.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- container.h 21 Oct 2003 22:08:34 -0000      1.6
+++ container.h 5 Nov 2003 00:11:04 -0000       1.7
@@ -53,6 +53,8 @@
   } padding;
 
   double x, y, w, h;    /* geometry */
+  
+  int clipper_orig_alpha;              /* original alpha value of clipper */
 
   int spacing;          /* space between elements */
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/esmart/src/container/container_smart.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- container_smart.c   21 Oct 2003 22:08:34 -0000      1.5
+++ container_smart.c   5 Nov 2003 00:11:04 -0000       1.6
@@ -75,6 +75,8 @@
   data->clipper = evas_object_rectangle_add(data->evas);
   evas_object_smart_member_add(obj, data->clipper);
   evas_object_repeat_events_set(data->clipper, 1);
+  
+  data->clipper_orig_alpha = 255;
 
   data->grabber = evas_object_rectangle_add(data->evas);
   evas_object_color_set(data->grabber, 40, 40, 255, 0);
@@ -279,6 +281,7 @@
   data = evas_object_smart_data_get(obj);
 
   evas_object_color_set(data->clipper, r, g, b, a);
+  data->clipper_orig_alpha = a;
 }
 
 void




-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to