[Xfce4-commits] r29512 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-02-18 22:17:27 +0000 (Wed, 18 Feb 2009)
New Revision: 29512

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/src/placement.c
Log:
	* src/placement.c: Same, still not right (Bug #4960). 
 

Modified: xfwm4/trunk/ChangeLog
===================================================================
--- xfwm4/trunk/ChangeLog	2009-02-18 19:39:36 UTC (rev 29511)
+++ xfwm4/trunk/ChangeLog	2009-02-18 22:17:27 UTC (rev 29512)
@@ -1,5 +1,9 @@
 2009-02-18	olivier
 
+	* src/placement.c: Same, still not right (Bug #4960).
+
+2009-02-18	olivier
+
 	* src/placement.c: Fix size not properly computed by the fill 
 	  function with a dock on top or left (Bug #4960).
 

Modified: xfwm4/trunk/src/placement.c
===================================================================
--- xfwm4/trunk/src/placement.c	2009-02-18 19:39:36 UTC (rev 29511)
+++ xfwm4/trunk/src/placement.c	2009-02-18 22:17:27 UTC (rev 29512)
@@ -923,10 +923,10 @@
         wc.x += MAX (frameX(west_neighbour) + frameWidth(west_neighbour) - full_x, 0);
     }
 
-    wc.width = full_w - frameRight(c) - (wc.x - rect.x);
+    wc.width = full_w - frameRight(c) - (wc.x - full_x);
     if (east_neighbour)
     {
-        wc.width -= MAX (full_w - (frameX(east_neighbour) - rect.x), 0);
+        wc.width -= MAX (full_w - (frameX(east_neighbour) - full_x), 0);
     }
 
     wc.y = full_y + frameTop(c);
@@ -935,10 +935,10 @@
         wc.y += MAX (frameY(north_neighbour) + frameHeight(north_neighbour) - full_y, 0);
     }
 
-    wc.height = full_h - frameBottom(c) - (wc.y - rect.y);
+    wc.height = full_h - frameBottom(c) - (wc.y - full_y);
     if (south_neighbour)
     {
-        wc.height -= MAX (full_h - (frameY(south_neighbour) - rect.y), 0);
+        wc.height -= MAX (full_h - (frameY(south_neighbour) - full_y), 0);
     }
 
     TRACE ("Fill size request: (%d,%d) %dx%d", wc.x, wc.y, wc.width, wc.height);