yet another simplification of dotile()

This commit is contained in:
Anselm R. Garbe 2006-10-05 12:18:04 +02:00
parent 0ef6e3103c
commit 2583a7c0d1
1 changed files with 25 additions and 30 deletions

55
view.c
View File

@ -133,17 +133,15 @@ dotile(Arg *arg) {
continue; continue;
} }
c->ismax = False; c->ismax = False;
c->x = sx;
c->y = sy + bh;
if(n == 1) { /* only 1 window */ if(n == 1) { /* only 1 window */
c->x = sx;
c->y = sy + bh;
c->w = sw - 2 * BORDERPX; c->w = sw - 2 * BORDERPX;
c->h = sh - 2 * BORDERPX - bh; c->h = sh - 2 * BORDERPX - bh;
} }
else if(i == 0) { /* master window */ else if(i == 0) { /* master window */
c->x = sx;
if(stackpos == StackLeft) if(stackpos == StackLeft)
c->x += stackw; c->x += stackw;
c->y = sy + bh;
switch(stackpos) { switch(stackpos) {
case StackLeft: case StackLeft:
case StackRight: case StackRight:
@ -156,35 +154,32 @@ dotile(Arg *arg) {
break; break;
} }
} }
else if(th > bh) { /* tile window */ else { /* tile window */
c->x = sx;
if(stackpos == StackRight) if(stackpos == StackRight)
c->x += master; c->x += master;
c->w = tw - 2 * BORDERPX; if(th > bh) {
c->h = th - 2 * BORDERPX; switch(stackpos) {
switch(stackpos) { case StackLeft:
case StackLeft: case StackRight:
case StackRight: c->y = sy + (i - 1) * th + bh;
c->y = sy + (i - 1) * th + bh; if(i + 1 == n)
if(i + 1 == n) c->h = sh - c->y - 2 * BORDERPX;
c->h = sh - c->y - 2 * BORDERPX; break;
break; case StackBottom:
case StackBottom: c->y = sy + master + (i - 1) * th + bh;
c->y = sy + master + (i - 1) * th + bh; if(i + 1 == n)
if(i + 1 == n) c->h = sh - c->y - 2 * BORDERPX;
c->h = sh - c->y - 2 * BORDERPX; break;
break; }
c->w = tw - 2 * BORDERPX;
c->h = th - 2 * BORDERPX;
}
else { /* fallback if th < bh */
if(stackpos == StackBottom)
c->y += master;
c->w = stackw - 2 * BORDERPX;
c->h = stackh - 2 * BORDERPX;
} }
}
else { /* fallback if th < bh */
c->x = sx;
if(stackpos == StackRight)
c->x += master;
c->y = sy + bh;
if(stackpos == StackBottom)
c->y += master;
c->w = stackw - 2 * BORDERPX;
c->h = stackh - 2 * BORDERPX;
} }
resize(c, False, TopLeft); resize(c, False, TopLeft);
i++; i++;