X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=layout.c;h=6eae290fbef7eb05890774013c13dc0a989dce6f;hb=22399a3bc05406a89f6ad717800b4d9ba41f6e0a;hp=9de26bcc53ec0cf6d73afbe919cee3777e290d05;hpb=399993c6b5d594278bf822e2981ebfe8bfcb58c7;p=dwm.git diff --git a/layout.c b/layout.c index 9de26bc..6eae290 100644 --- a/layout.c +++ b/layout.c @@ -1,4 +1,5 @@ -/* © 2004-2007 Anselm R. Garbe +/* © 2006-2007 Anselm R. Garbe + * © 2006-2007 Sander van Dijk * See LICENSE file for license details. */ #include "dwm.h" #include @@ -37,18 +38,18 @@ tile(void) { ny = way; if(i < nmaster) { ny += i * mh; - nw = mw - 2 * BORDERPX; - nh = mh - 2 * BORDERPX; + nw = mw - 2 * c->border; + nh = mh - 2 * c->border; } else { /* tile window */ nx += mw; - nw = tw - 2 * BORDERPX; - if(th > 2 * BORDERPX) { + nw = tw - 2 * c->border; + if(th > 2 * c->border) { ny += (i - nmaster) * th; - nh = th - 2 * BORDERPX; + nh = th - 2 * c->border; } - else /* fallback if th <= 2 * BORDERPX */ - nh = wah - 2 * BORDERPX; + else /* fallback if th <= 2 * c->border */ + nh = wah - 2 * c->border; } resize(c, nx, ny, nw, nh, False); i++; @@ -124,7 +125,7 @@ incmasterw(const char *arg) { masterw = MASTERWIDTH; else { i = atoi(arg); - if(waw * (masterw + i) / 1000 >= waw - 2 * BORDERPX + if(waw * (masterw + i) / 1000 >= waw - 2 * BORDERPX || waw * (masterw + i) / 1000 <= 2 * BORDERPX) return; masterw += i;