Xinqi Bao's Git

projects / dwm.git / commitdiff
summary | log | commit | diff | tree
raw | patch | inline | side by side (parent: 216099d)
fixing remaining space calculation
authorAnselm R. Garbe <[email protected]>
Wed, 9 May 2007 08:11:34 +0000 (10:11 +0200)
committerAnselm R. Garbe <[email protected]>
Wed, 9 May 2007 08:11:34 +0000 (10:11 +0200)
layout.c patch | blob | history

diff --git a/layout.c b/layout.c
index 8005894..3746a88 100644 (file)
--- a/layout.c
+++ b/layout.c
@@ -15,7 +15,7 @@ static unsigned int nmaster = NMASTER;
 
 static void
 tile(void) {
 
 static void
 tile(void) {
-       unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th;
+       unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th, remain;
        Client *c;
 
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
        Client *c;
 
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
@@ -24,6 +24,7 @@ tile(void) {
        mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
        mw = (n > nmaster) ? (waw * masterw) / 1000 : waw;
        th = (n > nmaster) ? wah / (n - nmaster) : 0;
        mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
        mw = (n > nmaster) ? (waw * masterw) / 1000 : waw;
        th = (n > nmaster) ? wah / (n - nmaster) : 0;
+       remain = (n > nmaster) ? wah - th * (n - nmaster) : 0;
        tw = waw - mw;
 
        for(i = 0, c = clients; c; c = c->next)
        tw = waw - mw;
 
        for(i = 0, c = clients; c; c = c->next)
@@ -46,10 +47,9 @@ tile(void) {
                                nw = tw - 2 * c->border;
                                if(th > 2 * c->border) {
                                        ny += (i - nmaster) * th;
                                nw = tw - 2 * c->border;
                                if(th > 2 * c->border) {
                                        ny += (i - nmaster) * th;
-                                       if(i == n - 1)
-                                               nh = wah - ny - 2 * c->border;
-                                       else
-                                               nh = th - 2 * c->border;
+                                       nh = th - 2 * c->border;
+                                       if (i == n - 1)
+                                               nh += remain;
                                }
                                else /* fallback if th <= 2 * c->border */
                                        nh = wah - 2 * c->border;
                                }
                                else /* fallback if th <= 2 * c->border */
                                        nh = wah - 2 * c->border;