fixing remaining space calculation

This commit is contained in:
Anselm R. Garbe 2007-05-09 10:11:34 +02:00
parent 216099d072
commit ecd9c3e222

View file

@ -15,7 +15,7 @@ static unsigned int nmaster = NMASTER;
static void static void
tile(void) { tile(void) {
unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th; unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th, remain;
Client *c; Client *c;
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next)) for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
@ -24,6 +24,7 @@ tile(void) {
mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1); mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
mw = (n > nmaster) ? (waw * masterw) / 1000 : waw; mw = (n > nmaster) ? (waw * masterw) / 1000 : waw;
th = (n > nmaster) ? wah / (n - nmaster) : 0; th = (n > nmaster) ? wah / (n - nmaster) : 0;
remain = (n > nmaster) ? wah - th * (n - nmaster) : 0;
tw = waw - mw; tw = waw - mw;
for(i = 0, c = clients; c; c = c->next) for(i = 0, c = clients; c; c = c->next)
@ -46,10 +47,9 @@ tile(void) {
nw = tw - 2 * c->border; nw = tw - 2 * c->border;
if(th > 2 * c->border) { if(th > 2 * c->border) {
ny += (i - nmaster) * th; ny += (i - nmaster) * th;
if(i == n - 1)
nh = wah - ny - 2 * c->border;
else
nh = th - 2 * c->border; nh = th - 2 * c->border;
if (i == n - 1)
nh += remain;
} }
else /* fallback if th <= 2 * c->border */ else /* fallback if th <= 2 * c->border */
nh = wah - 2 * c->border; nh = wah - 2 * c->border;