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

diff --git a/view.c b/view.c
index 587c53a..d61d0de 100644
--- a/view.c
+++ b/view.c
@@ -193,12 +193,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,9 +317,10 @@ zoom(Arg *arg)
 	if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
 		return;
 
-	if((c = sel)  == getnext(clients))
-		if(!(c = getnext(c->next)))
-			return;
+	if((c = sel) == getnext(clients))
+		for(c = getnext(c->next); c && c->isfloat; c = getnext(c->next));
+	if(!c)
+		return;
 	detach(c);
 	c->next = clients;
 	clients->prev = c;