From 637f1dacb7337402fc1c12c07a1dfb1fa60965be Mon Sep 17 00:00:00 2001
From: Lucas Murray <lmurray@undefinedfire.com>
Date: Fri, 1 Aug 2008 14:45:49 +0000
Subject: [PATCH] Fix off-by-one error in window corner snapping when resizing

svn path=/trunk/KDE/kdebase/workspace/; revision=840691
---
 geometry.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/geometry.cpp b/geometry.cpp
index 203da1d7a5..264c386025 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -620,29 +620,29 @@ QRect Workspace::adjustClientSize( Client* c, QRect moveResizeGeom, int mode )
 #define SNAP_WINDOW_C_TOP  if ( (sOWO?(newcy<ly):true)  \
                   && (newcx == lrx || newrx == lx)  \
                   && qAbs(ly-newcy) < deltaY ) {  \
-                  deltaY = qAbs( ly - newcy ); \
-                  newcy=ly; \
+                  deltaY = qAbs( ly - newcy + 1 ); \
+                  newcy = ly + 1; \
                   }
 
 #define SNAP_WINDOW_C_BOTTOM  if ( (sOWO?(newry>lry):true)  \
                   && (newcx == lrx || newrx == lx)  \
                   && qAbs(lry-newry) < deltaY ) {  \
-                  deltaY = qAbs( lry - newry ); \
-                  newry=lry; \
+                  deltaY = qAbs( lry - newry - 1 ); \
+                  newry = lry - 1; \
                   }
 
 #define SNAP_WINDOW_C_LEFT  if ( (sOWO?(newcx<lx):true)  \
                   && (newcy == lry || newry == ly)  \
                   && qAbs(lx-newcx) < deltaX ) {  \
-                  deltaX = qAbs( lx - newcx ); \
-                  newcx=lx; \
+                  deltaX = qAbs( lx - newcx + 1 ); \
+                  newcx = lx + 1; \
                   }
 
 #define SNAP_WINDOW_C_RIGHT  if ( (sOWO?(newrx>lrx):true)  \
                   && (newcy == lry || newry == ly)  \
                   && qAbs(lrx-newrx) < deltaX ) {  \
-                  deltaX = qAbs( lrx - newrx ); \
-                  newrx=lrx; \
+                  deltaX = qAbs( lrx - newrx - 1 ); \
+                  newrx = lrx - 1; \
                   }
 
                     switch ( mode )