E CVS: apps/e raster

[<enl...@li...>]

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
	e_border.c 


Log Message:


shade bug --

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -3 -r1.344 -r1.345
--- e_border.c	28 Jul 2005 04:35:44 -0000	1.344
+++ e_border.c	28 Jul 2005 10:30:54 -0000	1.345
@@ -2250,7 +2250,28 @@
 	     else if (!bd->lock_client_location)
 	       e_border_move(bd, x, y);
 	     else if (!bd->lock_client_size)
-	       e_border_resize(bd, w, h);
+	       {
+		  if ((bd->shaded) || (bd->shading))
+		    {
+		       int pw, ph;
+		       
+		       pw = bd->client.w;
+		       ph = bd->client.h;
+		       if ((bd->shade.dir == E_DIRECTION_UP) ||
+			   (bd->shade.dir == E_DIRECTION_DOWN))
+			 {
+			    e_border_resize(bd, w, bd->h);
+			    bd->client.h = ph;
+			 }
+		       else
+			 {
+			    e_border_resize(bd, bd->w, h);
+			    bd->client.w = pw;
+			 }
+		    }
+		  else
+		    e_border_resize(bd, w, h);
+	       }
 	  }
 	else
 	  {
@@ -2277,7 +2298,28 @@
 	       e->w, e->h);
 #endif
 	if (!bd->lock_client_size)
-	  e_border_resize(bd, w, h);
+	  {
+	     if ((bd->shaded) || (bd->shading))
+	       {
+		  int pw, ph;
+		  
+		  pw = bd->client.w;
+		  ph = bd->client.h;
+		  if ((bd->shade.dir == E_DIRECTION_UP) ||
+		      (bd->shade.dir == E_DIRECTION_DOWN))
+		    {
+		       e_border_resize(bd, w, bd->h);
+		       bd->client.h = ph;
+		    }
+		  else
+		    {
+		       e_border_resize(bd, bd->w, h);
+		       bd->client.w = pw;
+		    }
+	       }
+	     else
+	       e_border_resize(bd, w, h);
+	  }
      }
    if (!bd->lock_client_stacking)
      {
@@ -2366,7 +2408,26 @@
 	h = e->h + bd->client_inset.t + bd->client_inset.b;
 //	printf("##- ASK FOR 0x%x TO RESIZE TO %i,%i\n",
 //	       bd->client.win, e->w, e->h);
-	e_border_resize(bd, w, h);
+	if ((bd->shaded) || (bd->shading))
+	  {
+	     int pw, ph;
+	     
+	     pw = bd->client.w;
+	     ph = bd->client.h;
+	     if ((bd->shade.dir == E_DIRECTION_UP) ||
+		 (bd->shade.dir == E_DIRECTION_DOWN))
+	       {
+		  e_border_resize(bd, w, bd->h);
+		  bd->client.h = ph;
+	       }
+	     else
+	       {
+		  e_border_resize(bd, bd->w, h);
+		  bd->client.w = pw;
+	       }
+	  }
+	else
+	  e_border_resize(bd, w, h);
      }
    return 1;
 }