X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=4e2ffb35e526701517cf2b109e8286b91699220f;hb=f679125206ae28b38f77e9620a67365d310ddff3;hp=2f2d42a2cde19d27946491e210d8b12b49f11157;hpb=1d4a24dae02cfb3a3241c3d293e96dba910317bd;p=dwm.git

diff --git a/view.c b/view.c
index 2f2d42a..4e2ffb3 100644
--- a/view.c
+++ b/view.c
@@ -76,10 +76,10 @@ dotile(void) {
 	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
 		n++;
 	/* window geoms */
-	mw = (n > nmaster) ? (waw * master) / 1000 : waw;
 	mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
-	tw = waw - mw;
+	mw = (n > nmaster) ? (waw * master) / 1000 : waw;
 	th = (n > nmaster) ? wah / (n - nmaster) : 0;
+	tw = waw - mw;
 
 	for(i = 0, c = clients; c; c = c->next)
 		if(isvisible(c)) {
@@ -153,8 +153,7 @@ incnmaster(Arg *arg) {
 	if((arrange == dofloat) || (nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
 		return;
 	nmaster += arg->i;
-	snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster);
-	bmw = textw(mtext);
+	updatemodetext();
 	if(sel)
 		arrange();
 	else
@@ -224,8 +223,7 @@ togglefloat(Arg *arg) {
 void
 togglemode(Arg *arg) {
 	arrange = (arrange == dofloat) ? dotile : dofloat;
-	snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster);
-	bmw = textw(mtext);
+	updatemodetext();
 	if(sel)
 		arrange();
 	else
@@ -244,6 +242,12 @@ toggleview(Arg *arg) {
 }
 
 void
+updatemodetext() {
+	snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster);
+	bmw = textw(mtext);
+}
+
+void
 view(Arg *arg) {
 	unsigned int i;