applied resizecol fix by Jukka

[dwm.git] / view.c

diff --git a/view.c b/view.c
index a3b2029..d37933a 100644 (file)
--- a/view.c
+++ b/view.c
@@ -194,7 +194,7 @@ dotile(Arg *arg) {
                                        break;
                                case StackBottom:
                                        c->x = sx;
-                                       c->y = sy + master;
+                                       c->y = sy + master + bh;
                                        break;
                                case StackRight:
                                        c->x = sx + master;
@@ -259,6 +259,7 @@ isvisible(Client *c) {
 
 void
 resizecol(Arg *arg) {
+       int s;
        unsigned int n;
        Client *c;
 
@@ -268,13 +269,14 @@ resizecol(Arg *arg) {
        if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
                return;
 
+       s = stackpos == StackBottom ? sh - bh : sw;
        if(sel == getnext(clients)) {
-               if(master + arg->i > sw - MINW || master + arg->i < MINW)
+               if(master + arg->i > s - MINW || master + arg->i < MINW)
                        return;
                master += arg->i;
        }
        else {
-               if(master - arg->i > sw - MINW || master - arg->i < MINW)
+               if(master - arg->i > s - MINW || master - arg->i < MINW)
                        return;
                master -= arg->i;
        }
@@ -340,13 +342,8 @@ togglestackpos(Arg *arg) {
                stackpos = STACKPOS;
        else
                stackpos = StackBottom;
-       updatemaster();
-       arrange(NULL);
-}
-
-void
-updatemaster(void) {
        master = ((stackpos == StackBottom ? sh - bh : sw) * MASTER) / 100;
+       arrange(NULL);
 }
 
 void