fix scratchpad detection when moving traditionally

This commit is contained in:
Alexander Bocken 2021-11-23 11:15:48 +01:00
parent edf4a33c98
commit 81d74ae4e4
Signed by: Alexander
GPG Key ID: 1D237BE83F9B05E8

12
dwm.c
View File

@ -1773,11 +1773,11 @@ tagmon(const Arg *arg)
{ {
if (!selmon->sel || !mons->next) if (!selmon->sel || !mons->next)
return; return;
if(selmon->sel->tags > 1 << LENGTH(tags) << LENGTH(scratchpads)) if(selmon->sel->tags & SPTAGMASK){
sendmon(selmon->sel, dirtomon(arg->i));
else {
dirtomon(arg->i)->tagset[dirtomon(arg->i)->seltags] |= selmon->sel->tags; dirtomon(arg->i)->tagset[dirtomon(arg->i)->seltags] |= selmon->sel->tags;
sendmontags(selmon->sel, dirtomon(arg->i), selmon->sel->tags); sendmontags(selmon->sel, dirtomon(arg->i), selmon->sel->tags);
} else {
sendmon(selmon->sel, dirtomon(arg->i));
} }
} }
@ -2526,7 +2526,6 @@ bstackhoriz(Monitor *m) {
// } // }
//} //}
void void
centeredfirstwindow(Monitor *m) centeredfirstwindow(Monitor *m)
{ {
@ -2564,7 +2563,9 @@ centeredfirstwindow(Monitor *m)
resize(c, m->wx + mx, m->wy + my, w - (2*c->bw), resize(c, m->wx + mx, m->wy + my, w - (2*c->bw),
mh - (2*c->bw), 0); mh - (2*c->bw), 0);
mx += WIDTH(c); mx += WIDTH(c);
} } }
}
void void
centeredfloatingmaster(Monitor *m) centeredfloatingmaster(Monitor *m)
{ {
@ -2603,6 +2604,7 @@ centeredfloatingmaster(Monitor *m)
tx += WIDTH(c); tx += WIDTH(c);
} }
} }
void void
fibonacci(Monitor *mon, int s) { fibonacci(Monitor *mon, int s) {
unsigned int i, n, nx, ny, nw, nh; unsigned int i, n, nx, ny, nw, nh;