X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=dab812854caa3f0a132eaa98b71f18b901e6c75d;hb=1c2d673ded697f4b131f8700ce98392fbb383b2e;hp=44c0b308a1d57dc2d81641ec251f07371f35b0f1;hpb=6b25d06d7d159bf89d740847fedc876ab0137b6b;p=dwm.git diff --git a/view.c b/view.c index 44c0b30..dab8128 100644 --- a/view.c +++ b/view.c @@ -49,8 +49,8 @@ togglemax(Client *c) if((c->ismax = !c->ismax)) { c->rx = c->x; c->x = sx; c->ry = c->y; c->y = bh; - c->rw = c->w; c->w = sw; - c->rh = c->h; c->h = sh - bh - 2; + c->rw = c->w; c->w = sw - 2 * BORDERPX; + c->rh = c->h; c->h = sh - bh - 2 * BORDERPX; } else { c->x = c->rx; @@ -101,9 +101,8 @@ dotile(Arg *arg) { Client *c; w = sw - mw; - for(n = 0, c = clients; c; c = c->next) - if(isvisible(c) && !c->isfloat) - n++; + for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next)) + n++; if(n > 1) h = (sh - bh) / (n - 1); @@ -116,34 +115,33 @@ dotile(Arg *arg) { resize(c, True, TopLeft); continue; } - if(c->ismax) - togglemax(c); + c->ismax = False; if(n == 1) { c->x = sx; c->y = sy + bh; - c->w = sw - 2; - c->h = sh - 2 - bh; + c->w = sw - 2 * BORDERPX; + c->h = sh - 2 * BORDERPX - bh; } else if(i == 0) { c->x = sx; c->y = sy + bh; - c->w = mw - 2; - c->h = sh - 2 - bh; + c->w = mw - 2 * BORDERPX; + c->h = sh - 2 * BORDERPX - bh; } else if(h > bh) { c->x = sx + mw; c->y = sy + (i - 1) * h + bh; - c->w = w - 2; + c->w = w - 2 * BORDERPX; if(i + 1 == n) - c->h = sh - c->y - 2; + c->h = sh - c->y - 2 * BORDERPX; else - c->h = h - 2; + c->h = h - 2 * BORDERPX; } else { /* fallback if h < bh */ c->x = sx + mw; c->y = sy + bh; - c->w = w - 2; - c->h = sh - 2 - bh; + c->w = w - 2 * BORDERPX; + c->h = sh - 2 * BORDERPX - bh; } resize(c, False, TopLeft); i++;