From fe177b7c611d6c557275c7c9869cb7c31fa1a7e2 Mon Sep 17 00:00:00 2001
From: okan <okan>
Date: Thu, 12 Dec 2013 21:50:50 +0000
Subject: Make sure we really take work area gap into account with snap
 calculations; from Dominik Honnef via Christian Neukirchen.

---
 kbfunc.c    | 4 ++--
 mousefunc.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kbfunc.c b/kbfunc.c
index 9c0effc..47d4857 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -101,10 +101,10 @@ kbfunc_client_moveresize(struct client_ctx *cc, union arg *arg)
 
 		cc->geom.x += client_snapcalc(cc->geom.x,
 		    cc->geom.x + cc->geom.w + (cc->bwidth * 2),
-		    sc->work.x, sc->work.w, sc->snapdist);
+		    sc->work.x, sc->work.x + sc->work.w, sc->snapdist);
 		cc->geom.y += client_snapcalc(cc->geom.y,
 		    cc->geom.y + cc->geom.h + (cc->bwidth * 2),
-		    sc->work.y, sc->work.h, sc->snapdist);
+		    sc->work.y, sc->work.y + sc->work.h, sc->snapdist);
 
 		client_move(cc);
 		xu_ptr_getpos(cc->win, &x, &y);
diff --git a/mousefunc.c b/mousefunc.c
index f465802..e9be42d 100644
--- a/mousefunc.c
+++ b/mousefunc.c
@@ -147,10 +147,10 @@ mousefunc_client_move(struct client_ctx *cc, void *arg)
 
 			cc->geom.x += client_snapcalc(cc->geom.x,
 			    cc->geom.x + cc->geom.w + (cc->bwidth * 2),
-			    sc->work.x, sc->work.w, sc->snapdist);
+			    sc->work.x, sc->work.x + sc->work.w, sc->snapdist);
 			cc->geom.y += client_snapcalc(cc->geom.y,
 			    cc->geom.y + cc->geom.h + (cc->bwidth * 2),
-			    sc->work.y, sc->work.h, sc->snapdist);
+			    sc->work.y, sc->work.y + sc->work.h, sc->snapdist);
 
 			/* don't move more than 60 times / second */
 			if ((ev.xmotion.time - ltime) > (1000 / 60)) {
-- 
cgit 1.4.1