X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=view.c;h=1ca10275f6d004b51ce9fe2970b87f9b9ecd100a;hb=0384faeee5308d992e60084dd6565c78e6e11af4;hp=7c56ac264e11005e2dc136fae9edb3c4125906dc;hpb=010fd21b2037923e9ba1f0d67a67bbf8d8da2c89;p=dwm.git

diff --git a/view.c b/view.c
index 7c56ac2..1ca1027 100644
--- a/view.c
+++ b/view.c
@@ -103,18 +103,20 @@ dofloat(Arg *arg) {
  */
 void
 dotile(Arg *arg) {
-	int i, n, stackw, stackh, tw, th;
+	unsigned int i, n, md, stackw, stackh, tw, th;
 	Client *c;
 
 	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
 		n++;
 
 	if(stackpos == StackBottom) {
+		md = ((sh - bh) * master) / 1000;
 		stackw = sw;
-		stackh = sh - bh - master;
+		stackh = sh - bh - md;
 	}
 	else {
-		stackw = sw - master;
+		md = (sw * master) / 1000;
+		stackw = sw - md;
 		stackh = sh - bh;
 	}
 
@@ -131,75 +133,52 @@ 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 */
+				if(stackpos == StackLeft)
+					c->x += stackw;
 				switch(stackpos) {
 				case StackLeft:
-					c->x = sx + stackw;
-					c->y = sy + bh;
-					c->w = master - 2 * BORDERPX;
+				case StackRight:
+					c->w = md - 2 * BORDERPX;
 					c->h = sh - bh - 2 * BORDERPX;
 					break;
 				case StackBottom:
-					c->x = sx;
-					c->y = sy + bh;
 					c->w = sw - 2 * BORDERPX;
-					c->h = master - 2 * BORDERPX;
-					break;
-				case StackRight:
-					c->x = sx;
-					c->y = sy + bh;
-					c->w = master - 2 * BORDERPX;
-					c->h = sh - bh - 2 * BORDERPX;
+					c->h = md - 2 * BORDERPX;
 					break;
 				}
 			}
-			else if(th > bh) {
-				/* tile window */
-				c->w = tw - 2 * BORDERPX;
-				c->h = th - 2 * BORDERPX;
-				switch(stackpos) {
-				case StackLeft:
-					c->x = sx;
-					c->y = sy + (i - 1) * th + bh;
-					if(i + 1 == n)
-						c->h = sh - c->y - 2 * BORDERPX;
-					break;
-				case StackBottom:
-					c->x = sx;
-					c->y = sy + master + (i - 1) * th + bh;
-					if(i + 1 == n)
-						c->h = sh - c->y - 2 * BORDERPX;
-					break;
-				case StackRight:
-					c->x = sx + master;
-					c->y = sy + (i - 1) * th + bh;
-					if(i + 1 == n)
-						c->h = sh - c->y - 2 * BORDERPX;
-					break;
+			else {  /* tile window */
+				if(stackpos == StackRight)
+					c->x += md;
+				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 + md + (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 */
-				c->w = stackw - 2 * BORDERPX;
-				c->h = stackh - 2 * BORDERPX;
-				switch(stackpos) {
-				case StackLeft:
-					c->x = sx;
-					c->y = sy + bh;
-					break;
-				case StackBottom:
-					c->x = sx;
-					c->y = sy + master + bh;
-					break;
-				case StackRight:
-					c->x = sx + master;
-					c->y = sy + bh;
-					break;
+				else { /* fallback if th < bh */
+					if(stackpos == StackBottom)
+						c->y += md;
+					c->w = stackw - 2 * BORDERPX;
+					c->h = stackh - 2 * BORDERPX;
 				}
 			}
 			resize(c, False, TopLeft);
@@ -269,12 +248,12 @@ resizecol(Arg *arg) {
 		return;
 
 	if(sel == getnext(clients)) {
-		if(master + arg->i > sw - MINW || master + arg->i < MINW)
+		if(master + arg->i > 95 || master + arg->i < 5)
 			return;
 		master += arg->i;
 	}
 	else {
-		if(master - arg->i > sw - MINW || master - arg->i < MINW)
+		if(master - arg->i > 95 || master - arg->i < 5)
 			return;
 		master -= arg->i;
 	}
@@ -340,7 +319,6 @@ togglestackpos(Arg *arg) {
 		stackpos = STACKPOS;
 	else
 		stackpos = StackBottom;
-	master = ((stackpos == StackBottom ? sh - bh : sw) * MASTER) / 100;
 	arrange(NULL);
 }