X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=view.c;h=ac201e60e13ba39ceafba9fa52cd68cd860f9793;hb=f6656fffb4e0c6a9a59e2669da4f7bebda19f08e;hp=587c53a9258c1d028bc0caa2c2e9d33fe3210d28;hpb=ec85fddb9a3a93a216b779cc39fead1a3d90aafd;p=dwm.git

diff --git a/view.c b/view.c
index 587c53a..ac201e6 100644
--- a/view.c
+++ b/view.c
@@ -38,6 +38,13 @@ reorder()
 	clients = newclients;
 }
 
+static Client *
+nexttiled(Client *c)
+{
+	for(c = getnext(c->next); c && c->isfloat; c = getnext(c->next));
+	return c;
+}
+
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
@@ -193,12 +200,12 @@ resizecol(Arg *arg)
 		return;
 
 	if(sel == getnext(clients)) {
-		if(mw + arg->i > sw - 100)
+		if(mw + arg->i > sw - 100 || mw + arg->i < 100)
 			return;
 		mw += arg->i;
 	}
 	else {
-		if(mw - arg->i < 100)
+		if(mw - arg->i > sw - 100 || mw - arg->i < 100)
 			return;
 		mw -= arg->i;
 	}
@@ -317,8 +324,8 @@ zoom(Arg *arg)
 	if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
 		return;
 
-	if((c = sel)  == getnext(clients))
-		if(!(c = getnext(c->next)))
+	if((c = sel) == nexttiled(clients))
+		if(!(c = nexttiled(c)))
 			return;
 	detach(c);
 	c->next = clients;