[Xfce4-commits] r25839 - xfwm4/trunk/src

[Olivier Fourdan]

Author: olivier
Date: 2007-06-23 17:44:02 +0000 (Sat, 23 Jun 2007)
New Revision: 25839

Modified:
   xfwm4/trunk/src/client.c
Log:
Computes the right size when filling

Modified: xfwm4/trunk/src/client.c
===================================================================
--- xfwm4/trunk/src/client.c	2007-06-23 17:30:53 UTC (rev 25838)
+++ xfwm4/trunk/src/client.c	2007-06-23 17:44:02 UTC (rev 25839)
@@ -3346,8 +3346,7 @@
 
     if (east_neighbour)
     {
-        wc.x = frameX(east_neighbour) + frameWidth(east_neighbour) +
-            (frameLeft(c) + frameRight(east_neighbour));
+        wc.x = frameX(east_neighbour) + frameWidth(east_neighbour) + frameLeft(c);
     }
     else
     {
@@ -3356,19 +3355,16 @@
 
     if (west_neighbour)
     {
-        wc.width = frameX(west_neighbour) - wc.x -
-            (frameRight(c) + frameLeft(west_neighbour));
+        wc.width = frameX(west_neighbour) - frameRight(c) - wc.x;
     }
     else
     {
-        wc.width = screen_info->width - wc.x -
-            (frameRight(c));
+        wc.width = screen_info->width - frameRight(c) - wc.x;
     }
 
     if (north_neighbour)
     {
-        wc.y = frameY(north_neighbour) + frameHeight(north_neighbour) +
-            (frameTop(c) + frameBottom(north_neighbour));
+        wc.y = frameY(north_neighbour) + frameHeight(north_neighbour) + frameTop(c);
     }
     else
     {
@@ -3377,12 +3373,11 @@
 
     if (south_neighbour)
     {
-        wc.height = frameY(south_neighbour) - wc.y -
-            (frameTop(south_neighbour) + frameBottom(c));
+        wc.height = frameY(south_neighbour) - frameBottom(c) - wc.y;
     }
     else
     {
-        wc.height = screen_info->height - wc.y;
+        wc.height = screen_info->height - frameBottom(c) - wc.y;
     }
 
     if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MANAGED))