only snap within window area
This commit is contained in:
parent
3afca3e6a1
commit
71365a524f
31
dwm.c
31
dwm.c
@ -1039,16 +1039,19 @@ movemouse(Client *c) {
|
|||||||
XSync(dpy, False);
|
XSync(dpy, False);
|
||||||
nx = ocx + (ev.xmotion.x - x1);
|
nx = ocx + (ev.xmotion.x - x1);
|
||||||
ny = ocy + (ev.xmotion.y - y1);
|
ny = ocy + (ev.xmotion.y - y1);
|
||||||
if(abs(wx - nx) < snap)
|
if(snap && nx >= wx && nx <= wx + ww
|
||||||
nx = wx;
|
&& ny >= wy && ny <= wy + wh) {
|
||||||
else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < snap)
|
if(abs(wx - nx) < snap)
|
||||||
nx = wx + ww - c->w - 2 * c->bw;
|
nx = wx;
|
||||||
if(abs(wy - ny) < snap)
|
else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < snap)
|
||||||
ny = wy;
|
nx = wx + ww - c->w - 2 * c->bw;
|
||||||
else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < snap)
|
if(abs(wy - ny) < snap)
|
||||||
ny = wy + wh - c->h - 2 * c->bw;
|
ny = wy;
|
||||||
if(!c->isfloating && lt->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
|
else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < snap)
|
||||||
togglefloating(NULL);
|
ny = wy + wh - c->h - 2 * c->bw;
|
||||||
|
if(!c->isfloating && lt->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
|
||||||
|
togglefloating(NULL);
|
||||||
|
}
|
||||||
if(!lt->arrange || c->isfloating)
|
if(!lt->arrange || c->isfloating)
|
||||||
resize(c, nx, ny, c->w, c->h, False);
|
resize(c, nx, ny, c->w, c->h, False);
|
||||||
break;
|
break;
|
||||||
@ -1193,8 +1196,12 @@ resizemouse(Client *c) {
|
|||||||
XSync(dpy, False);
|
XSync(dpy, False);
|
||||||
nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
|
nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
|
||||||
nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
|
nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
|
||||||
if(!c->isfloating && lt->arrange && (abs(nw - c->w) > snap || abs(nh - c->h) > snap)) {
|
|
||||||
togglefloating(NULL);
|
if(snap && nw >= wx && nw <= wx + ww
|
||||||
|
&& nh >= wy && nh <= wy + wh) {
|
||||||
|
if(!c->isfloating && lt->arrange
|
||||||
|
&& (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
|
||||||
|
togglefloating(NULL);
|
||||||
}
|
}
|
||||||
if(!lt->arrange || c->isfloating)
|
if(!lt->arrange || c->isfloating)
|
||||||
resize(c, c->x, c->y, nw, nh, True);
|
resize(c, c->x, c->y, nw, nh, True);
|
||||||
|
Loading…
Reference in New Issue
Block a user