fixing zoom

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 587c53a..d61d0de 100644 (file)
--- 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;