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

[Olivier Fourdan]

Author: olivier
Date: 2009-03-27 15:55:13 +0000 (Fri, 27 Mar 2009)
New Revision: 29685

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/placement.c
Log:
	* src/placement.c: Do not not fill over adjacent windows (Bug #5152)

Modified: xfwm4/trunk/ChangeLog
===================================================================
--- xfwm4/trunk/ChangeLog	2009-03-25 20:34:37 UTC (rev 29684)
+++ xfwm4/trunk/ChangeLog	2009-03-27 15:55:13 UTC (rev 29685)
@@ -1,3 +1,7 @@
+2009-03-26	olivier
+
+	* src/placement.c: Do not not fill over adjacent windows (Bug #5152)
+
 2009-03-25	olivier
 
 	* src/client.c, src/cycle.c: Fix a long standing bug in xfwm4 4.6 

Modified: xfwm4/trunk/NEWS
===================================================================
--- xfwm4/trunk/NEWS	2009-03-25 20:34:37 UTC (rev 29684)
+++ xfwm4/trunk/NEWS	2009-03-27 15:55:13 UTC (rev 29685)
@@ -10,6 +10,7 @@
 - Avoid unecessary warnings about timestamps at startup
 - Fix a long standing bug in xfwm4 4.6 were activating a transient would not
   regrab the mouse on parent window.
+- Do not go over adjacent windows with fill (Bug #5152)
 
 4.6.0
 =====

Modified: xfwm4/trunk/src/placement.c
===================================================================
--- xfwm4/trunk/src/placement.c	2009-03-25 20:34:37 UTC (rev 29684)
+++ xfwm4/trunk/src/placement.c	2009-03-27 15:55:13 UTC (rev 29685)
@@ -792,7 +792,7 @@
                  */
                 if (segment_overlap (frameY(c), frameY(c) + frameHeight(c), frameY(c2), frameY(c2) + frameHeight(c2)))
                 {
-                    if ((frameX(c2) + frameWidth(c2)) < frameX(c))
+                    if ((frameX(c2) + frameWidth(c2)) <= frameX(c))
                     {
                         if (west_neighbour)
                         {
@@ -809,7 +809,7 @@
                             west_neighbour = c2;
                         }
                     }
-                    if ((frameX(c) + frameWidth(c)) < frameX(c2))
+                    if ((frameX(c) + frameWidth(c)) <= frameX(c2))
                     {
                         /* Check if c2 is closer to the client
                          * then the west neighbour already found
@@ -837,7 +837,7 @@
                  */
                 if (segment_overlap (frameX(c), frameX(c) + frameWidth(c), frameX(c2), frameX(c2) + frameWidth(c2)))
                 {
-                    if ((frameY(c2) + frameHeight(c2)) < frameY(c))
+                    if ((frameY(c2) + frameHeight(c2)) <= frameY(c))
                     {
                         if (north_neighbour)
                         {
@@ -854,7 +854,7 @@
                             north_neighbour = c2;
                         }
                     }
-                    if ((frameY(c) + frameHeight(c)) < frameY(c2))
+                    if ((frameY(c) + frameHeight(c)) <= frameY(c2))
                     {
                         if (south_neighbour)
                         {