aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnselm R. Garbe <arg@10kloc.org>2006-10-05 12:18:04 +0200
committerAnselm R. Garbe <arg@10kloc.org>2006-10-05 12:18:04 +0200
commit2583a7c0d18749c391a7149f2f1ffb3efd91ba8d (patch)
tree5b3903ca9b0999b029676066f52f386159abe22c
parent0ef6e3103c60510ebde09b74fb0f3590a641e6cc (diff)
downloaddwm-2583a7c0d18749c391a7149f2f1ffb3efd91ba8d.tar.gz
yet another simplification of dotile()
-rw-r--r--view.c55
1 files changed, 25 insertions, 30 deletions
diff --git a/view.c b/view.c
index 93a8c66..1bce54a 100644
--- a/view.c
+++ b/view.c
@@ -133,17 +133,15 @@ dotile(Arg *arg) {
continue;
}
c->ismax = False;
+ c->x = sx;
+ c->y = sy + bh;
if(n == 1) { /* only 1 window */
- c->x = sx;
- c->y = sy + bh;
c->w = sw - 2 * BORDERPX;
c->h = sh - 2 * BORDERPX - bh;
}
else if(i == 0) { /* master window */
- c->x = sx;
if(stackpos == StackLeft)
c->x += stackw;
- c->y = sy + bh;
switch(stackpos) {
case StackLeft:
case StackRight:
@@ -156,35 +154,32 @@ dotile(Arg *arg) {
break;
}
}
- else if(th > bh) { /* tile window */
- c->x = sx;
+ else { /* tile window */
if(stackpos == StackRight)
c->x += master;
- c->w = tw - 2 * BORDERPX;
- c->h = th - 2 * BORDERPX;
- switch(stackpos) {
- case StackLeft:
- case StackRight:
- c->y = sy + (i - 1) * th + bh;
- if(i + 1 == n)
- c->h = sh - c->y - 2 * BORDERPX;
- break;
- case StackBottom:
- c->y = sy + master + (i - 1) * th + bh;
- if(i + 1 == n)
- c->h = sh - c->y - 2 * BORDERPX;
- break;
+ if(th > bh) {
+ switch(stackpos) {
+ case StackLeft:
+ case StackRight:
+ c->y = sy + (i - 1) * th + bh;
+ if(i + 1 == n)
+ c->h = sh - c->y - 2 * BORDERPX;
+ break;
+ case StackBottom:
+ c->y = sy + master + (i - 1) * th + bh;
+ if(i + 1 == n)
+ c->h = sh - c->y - 2 * BORDERPX;
+ 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);
i++;