From c139df129c45eab966836e622c71deec821ba370 Mon Sep 17 00:00:00 2001 From: okan Date: Wed, 2 Jan 2013 21:41:14 +0000 Subject: [PATCH] pass the screen workarea, as opposed to viewarea, allowing client snapping to honor gap. --- kbfunc.c | 4 ++-- mousefunc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kbfunc.c b/kbfunc.c index 6c8fef8..9f5ca9d 100644 --- a/kbfunc.c +++ b/kbfunc.c @@ -102,10 +102,10 @@ kbfunc_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->view.x, sc->view.w, Conf.snapdist); + sc->work.x, sc->work.w, Conf.snapdist); cc->geom.y += client_snapcalc(cc->geom.y, cc->geom.y + cc->geom.h + (cc->bwidth * 2), - sc->view.y, sc->view.h, Conf.snapdist); + sc->work.y, sc->work.h, Conf.snapdist); client_move(cc); xu_ptr_getpos(cc->win, &x, &y); diff --git a/mousefunc.c b/mousefunc.c index 1b207ce..1d2b287 100644 --- a/mousefunc.c +++ b/mousefunc.c @@ -163,10 +163,10 @@ mousefunc_window_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->view.x, sc->view.w, Conf.snapdist); + sc->work.x, sc->work.w, Conf.snapdist); cc->geom.y += client_snapcalc(cc->geom.y, cc->geom.y + cc->geom.h + (cc->bwidth * 2), - sc->view.y, sc->view.h, Conf.snapdist); + sc->work.y, sc->work.h, Conf.snapdist); /* don't move more than 60 times / second */ if ((ev.xmotion.time - ltime) > (1000 / 60)) {