Enlightenment CVS committal

Author  : raster
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_border.c 


Log Message:


fix shadow/shape bug :)

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -3 -r1.312 -r1.313
--- e_border.c  4 Jul 2005 11:34:57 -0000       1.312
+++ e_border.c  7 Jul 2005 03:49:35 -0000       1.313
@@ -3952,8 +3952,9 @@
               }
             free(rects);
          }
+       else
+         bd->client.shaped = 0;
        bd->need_shape_merge = 1;
-       /* is the client shaped? */
        bd->changes.shape = 0;
      }
 
@@ -4317,7 +4318,7 @@
    if ((bd->changes.pos) && (bd->changes.size))
      {
 //     printf("##- BORDER NEEDS POS/SIZE CHANGE 0x%x\n", bd->client.win);
-       if (bd->shaded && !bd->shading)
+       if ((bd->shaded) && (!bd->shading))
          {
             evas_obscured_clear(bd->bg_evas);
             ecore_x_window_move_resize(bd->win, bd->x, bd->y, bd->w, bd->h);
@@ -4463,9 +4464,6 @@
                  rects[3].height = bd->client_inset.b;
                  ecore_x_window_shape_rectangles_set(twin, rects, 4);
               }
-            /* FIXME: need to clip client shape to client container
-             * with offset for shading, if shading/shaded
-             */
             twin2 = ecore_x_window_override_new(bd->win, 0, 0, 
                                                 bd->w - bd->client_inset.l - 
bd->client_inset.r,
                                                 bd->h - bd->client_inset.t - 
bd->client_inset.b);
@@ -4494,6 +4492,7 @@
          {
             ecore_x_window_shape_mask_set(bd->win, 0);
          }
+//     bd->need_shape_export = 1;
        bd->need_shape_merge = 0;
      }
    
@@ -4513,6 +4512,7 @@
                  int i;
                  
                  orects = bd->shape_rects;
+                 changed = 0;
                  for (i = 0; i < num; i++)
                    {
                       if ((orects[i].x != rects[i].x) ||
@@ -4524,7 +4524,6 @@
                            break;
                         }
                    }
-                 changed = 0;
               }
             if (changed)
               {




-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to