diff options
| author | Nicholas Noll <nnoll523@gmail.com> | 2020-06-26 16:34:55 +0200 |
|---|---|---|
| committer | Nicholas Noll <nnoll523@gmail.com> | 2020-06-26 16:34:55 +0200 |
| commit | 975afe99bc3d5997c0b49c66e0777ebda4f6106b (patch) | |
| tree | 728ba235182ed5c22ac71609ce13b9ed46e64224 | |
| parent | 63424e9709751108c564f884cb4fdffab77c933d (diff) | |
fix: external gaps now fit as squares
| -rw-r--r-- | sys/cmd/dwm/dwm.c | 8 | ||||
| -rw-r--r-- | sys/cmd/term/x.c | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sys/cmd/dwm/dwm.c b/sys/cmd/dwm/dwm.c index afc7e30..c14a1f0 100644 --- a/sys/cmd/dwm/dwm.c +++ b/sys/cmd/dwm/dwm.c @@ -865,16 +865,16 @@ tile(Monitor *m) else mw = m->ww; - for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) + for (i = 0, my = ty = gapx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) if (i < m->nmaster) { r = MIN(n, m->nmaster) - i; - h = (m->wh - my - gapx*(r-1))/r; - resize(c, m->wx + gapx, m->wy + my + gapx, mw - (2*c->bw) - gapx, h - (2*c->bw), 0); + h = (m->wh - my)/r - gapx; + resize(c, m->wx + gapx, m->wy + my, mw - (2*c->bw) - gapx, h - (2*c->bw), 0); if (my + HEIGHT(c) + gapx < m->wh) my += HEIGHT(c) + gapx; } else { r = (n-i); - h = ((m->wh - ty) - gapx*(r-1))/r; + h = (m->wh - ty)/r - gapx; resize(c, m->wx + mw + gapx, m->wy + ty, m->ww - mw - (2*c->bw) - (2*gapx), h - (2*c->bw), 0); if (ty + HEIGHT(c) + gapx < m->wh) ty += HEIGHT(c) + gapx; diff --git a/sys/cmd/term/x.c b/sys/cmd/term/x.c index cdf82d7..1da23cb 100644 --- a/sys/cmd/term/x.c +++ b/sys/cmd/term/x.c @@ -706,7 +706,7 @@ cresize(int width, int height) row = MAX(1, row); win.hb = (win.w - col*win.cw)/2; - win.vb = (win.h - col*win.ch)/2; + win.vb = (win.h - row*win.ch)/2; tresize(col, row); xresize(col, row); @@ -1123,8 +1123,9 @@ xinit(int cols, int rows) xloadcols(); /* adjust fixed window geometry */ - win.w = 2 * win.hb + cols * win.cw; - win.h = 2 * win.vb + rows * win.ch; + win.w = 2 * win.hb + cols*win.cw; + win.h = 2 * win.vb + rows*win.ch; + if (xw.gm & XNegative) xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2; if (xw.gm & YNegative) |