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

[Olivier Fourdan]

Author: olivier
Date: 2009-01-29 20:50:40 +0000 (Thu, 29 Jan 2009)
New Revision: 29409

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/placement.c
Log:
	* src/placement.c: Apparently someone is confusing East and West :)
	  Fix fill function not working with multiscreen. 
 

Modified: xfwm4/trunk/ChangeLog
===================================================================
--- xfwm4/trunk/ChangeLog	2009-01-29 20:47:48 UTC (rev 29408)
+++ xfwm4/trunk/ChangeLog	2009-01-29 20:50:40 UTC (rev 29409)
@@ -1,5 +1,10 @@
 2009-01-29	olivier
 
+	* src/placement.c: Apparently someone is confusing East and West :)
+	  Fix fill function not working with multiscreen.
+
+2009-01-29	olivier
+
 	* src/events.c: Clear monitor cache when the screen size changes, but 
 	  avoid redoing the work twice in the case of a monitor-changed event.
 

Modified: xfwm4/trunk/NEWS
===================================================================
--- xfwm4/trunk/NEWS	2009-01-29 20:47:48 UTC (rev 29408)
+++ xfwm4/trunk/NEWS	2009-01-29 20:50:40 UTC (rev 29409)
@@ -1,7 +1,8 @@
 4.6.0?
 =====
 
-- Fix possible monitor cache size inconsistency when the screen size changes
+- Fix possible monitor cache size inconsistency when the screen size changes.
+- Fix fill function not working with multiscreen.
 
 4.5.99.1 (Xfce 4.6rc1)
 ======================

Modified: xfwm4/trunk/src/placement.c
===================================================================
--- xfwm4/trunk/src/placement.c	2009-01-29 20:47:48 UTC (rev 29408)
+++ xfwm4/trunk/src/placement.c	2009-01-29 20:50:40 UTC (rev 29409)
@@ -760,6 +760,7 @@
     int tmp_x, tmp_y, tmp_w, tmp_h;
 
     g_return_if_fail (c != NULL);
+    TRACE ("entering clientFill");
 
     if (!CLIENT_CAN_FILL_WINDOW (c))
     {
@@ -793,19 +794,19 @@
                 {
                     if ((frameX(c2) + frameWidth(c2)) < frameX(c))
                     {
-                        if (east_neighbour)
+                        if (west_neighbour)
                         {
                             /* Check if c2 is closer to the client
-                             * then the east neighbour already found
+                             * then the west neighbour already found
                              */
-                            if ((frameX(east_neighbour) + frameWidth(east_neighbour)) < (frameX(c2) + frameWidth(c2)))
+                            if ((frameX(west_neighbour) + frameWidth(west_neighbour)) < (frameX(c2) + frameWidth(c2)))
                             {
-                                east_neighbour = c2;
+                                west_neighbour = c2;
                             }
                         }
                         else
                         {
-                            east_neighbour = c2;
+                            west_neighbour = c2;
                         }
                     }
                     if ((frameX(c) + frameWidth(c)) < frameX(c2))
@@ -813,16 +814,16 @@
                         /* Check if c2 is closer to the client
                          * then the west neighbour already found
                          */
-                        if (west_neighbour)
+                        if (east_neighbour)
                         {
-                            if (frameX(c2) < frameX(west_neighbour))
+                            if (frameX(c2) < frameX(east_neighbour))
                             {
-                                west_neighbour = c2;
+                                east_neighbour = c2;
                             }
                         }
                         else
                         {
-                            west_neighbour = c2;
+                            east_neighbour = c2;
                         }
                     }
                 }
@@ -917,9 +918,9 @@
      */
 
     wc.x = frameLeft(c);
-    if (east_neighbour)
+    if (west_neighbour)
     {
-        wc.x += MAX (frameX(east_neighbour) + frameWidth(east_neighbour), full_x);
+        wc.x += MAX (frameX(west_neighbour) + frameWidth(west_neighbour), full_x);
     }
     else
     {
@@ -927,9 +928,9 @@
     }
 
     wc.width = full_x - frameRight(c) - wc.x;
-    if (west_neighbour)
+    if (east_neighbour)
     {
-        wc.width += MIN (frameX(west_neighbour), full_w);
+        wc.width += MIN (frameX(east_neighbour) - rect.x, full_w);
     }
     else
     {
@@ -949,7 +950,7 @@
     wc.height = full_y - frameBottom(c) - wc.y;
     if (south_neighbour)
     {
-        wc.height += MIN (frameY(south_neighbour), full_h);
+        wc.height += MIN (frameY(south_neighbour) - rect.y, full_h);
     }
     else
     {