Fixed a bunch of sizing/spacing issues in centerfair, reversed client order in center...

diff --git a/layout/cascadetile.lua b/layout/cascadetile.lua
index e9b942560cc6a32333d4de128b413d45cd8c7840..2ec097494319cac3c921b0a6bd9892e8ccbe80ed 100644 (file)
--- a/layout/cascadetile.lua
+++ b/layout/cascadetile.lua
@@ -100,7 +100,7 @@ function cascadetile.arrange(p)
     if #cls > 0
     then
         -- Main column, fixed width and height.
-        local c = cls[#cls]
+        local c = cls[1]
         local g = {}
         local mainwid = wa.width * mwfact
         local slavewid = wa.width - mainwid
@@ -143,14 +143,14 @@ function cascadetile.arrange(p)
         -- Remaining clients stacked in slave column, new ones on top.
         if #cls > 1
         then
-            for i = (#cls - 1),1,-1
+            for i = (#cls),2,-1
             do
                 c = cls[i]
                 g = {}
                 g.width = slavewid - current_offset_x
                 g.height = wa.height - current_offset_y
                 g.x = wa.x + mainwid + (how_many - i) * cascadetile.offset_x
-                g.y = wa.y + (i - 1) * cascadetile.offset_y + global_border
+                g.y = wa.y + (i - 2) * cascadetile.offset_y + global_border
                 if useless_gap > 0
                 then
                     g.width = g.width - 2 * useless_gap

diff --git a/layout/centerfair.lua b/layout/centerfair.lua
index 1e8915d0c494c178af3b7ab6e9926f33a5cf5db5..2447b55a70ae35c908da55a5857d0e2ea3fbb52d 100644 (file)
--- a/layout/centerfair.lua
+++ b/layout/centerfair.lua
@@ -57,8 +57,8 @@ function centerfair.arrange(p)
     local cls = p.clients
 
     -- Borders are factored in.
-    wa.height = wa.height - ((global_border * 2) + (bw * 2))
-    wa.width = wa.width - ((global_border * 2) + (bw * 2))
+    wa.height = wa.height - (global_border * 2)
+    wa.width = wa.width - (global_border * 2)
 
     -- How many vertical columns? Read from nmaster on the tag.
     local t = tag.selected(p.screen)
@@ -66,19 +66,19 @@ function centerfair.arrange(p)
     local ncol = centerfair.ncol or tag.getncol(t)
     if num_x <= 2 then num_x = 2 end
 
-    local width = math.floor((wa.width-(num_x+1)*useless_gap) / num_x)
+    local width = math.floor((wa.width - (num_x + 1)*useless_gap - num_x*2*bw) / num_x)
 
     local offset_y = wa.y + useless_gap
     if #cls < num_x
     then
         -- Less clients than the number of columns, let's center it!
-        local offset_x = wa.x + useless_gap + (wa.width - #cls*width - (#cls+1)*useless_gap) / 2
+        local offset_x = wa.x + (wa.width - #cls*width - #cls*2*bw - (#cls - 1)*useless_gap) / 2
         local g = {}
         g.width = width
-        g.height = wa.height - 2*useless_gap - 2
+        g.height = wa.height - 2*useless_gap - 2*bw
         g.y = offset_y + global_border
         for i = 1, #cls do
-            g.x = offset_x + (#cls - i) * (width + useless_gap + 2) + global_border
+            g.x = offset_x + (i - 1) * (width + useless_gap + 2*bw) + global_border
             cls[i]:geometry(g)
         end
     else
@@ -90,12 +90,12 @@ function centerfair.arrange(p)
 
         -- Master client deserves a special treatement
         local g = {}
-        g.width = wa.width - (num_x  - 1) * width - num_x * 2*useless_gap - 2
-        g.height = wa.height - 2*useless_gap - 2
+        g.width = wa.width - ((num_x - 1)*width + (num_x + 1)*useless_gap + num_x*2*bw)
+        g.height = wa.height - 2*useless_gap - 2*bw
         g.x = offset_x + useless_gap + global_border
         g.y = offset_y + global_border
 
-        cls[#cls]:geometry(g)
+        cls[1]:geometry(g)
 
         -- Treat the other clients
 
@@ -134,28 +134,22 @@ function centerfair.arrange(p)
         end
 
         -- Compute geometry of the other clients
-        local nclient = #cls-1 -- we start with the 2nd client
-        g.x = g.x + g.width+useless_gap + 2
+        local nclient = 2 -- we start with the 2nd client
+        g.x = g.x + g.width + 2*bw + useless_gap
         g.width = width
 
-        if useless_gap > 0 then
-            g.width = g.width + useless_gap - 2
-        end
-
         for i = 1, (num_x-1) do
-            to_remove = 2
-            g.height = math.floor((wa.height - (num_y[i] * useless_gap)) / num_y[i])
+            g.height = math.floor((wa.height - (num_y[i] + 1)*useless_gap - num_y[i]*2*bw) / num_y[i])
             g.y = offset_y + global_border
             for j = 0, (num_y[i]-2) do
                 cls[nclient]:geometry(g)
-                nclient = nclient - 1
-                g.y = g.y + g.height+useless_gap + 2
-                to_remove = to_remove + 2
+                nclient = nclient + 1
+                g.y = g.y + g.height + 2*bw + useless_gap
             end
-            g.height = wa.height - num_y[i]*useless_gap - (num_y[i]-1)*g.height - useless_gap - to_remove
+            g.height = wa.height - (num_y[i] + 1)*useless_gap - (num_y[i]-1)*g.height - num_y[i]*2*bw
             cls[nclient]:geometry(g)
-            nclient = nclient - 1
-            g.x = g.x+g.width+useless_gap + 2
+            nclient = nclient + 1
+            g.x = g.x + g.width + 2*bw + useless_gap
         end
     end
 end

diff --git a/layout/centerwork.lua b/layout/centerwork.lua
index 61f4907b78d1f581f11d013a467ff72a5af3ea00..154b87dedb5ff5143b349e2cdd80be08d2548466 100644 (file)
--- a/layout/centerwork.lua
+++ b/layout/centerwork.lua
@@ -18,8 +18,8 @@ local centerwork =
     name         = "centerwork",
     top_left     = 0,
     top_right    = 1,
-    bottom_left  = 2,
-    bottom_right = 3
+    bottom_left  = 3,
+    bottom_right = 2
 }
 
 function centerwork.arrange(p)
@@ -50,7 +50,7 @@ function centerwork.arrange(p)
     if #cls > 0
     then
         -- Main column, fixed width and height.
-        local c = cls[#cls]
+        local c = cls[1]
         local g = {}
         local mainwid = math.floor(wa.width * mwfact)
         local slavewid = wa.width - mainwid
@@ -70,7 +70,7 @@ function centerwork.arrange(p)
         if #cls > 1
         then
             local at = 0
-            for i = (#cls - 1),1,-1
+            for i = (#cls),2,-1
             do
                 -- It's all fixed. If there are more than 5 clients,
                 -- those additional clients will float. This is
@@ -83,28 +83,28 @@ function centerwork.arrange(p)
                 c = cls[i]
                 g = {}
 
-                if at == centerwork.top_left
+                if i - 2 == centerwork.top_left
                 then
                     -- top left
                     g.x = wa.x + useless_gap + global_border
                     g.y = wa.y + useless_gap + global_border
                     g.width = slaveLwid - 2 * useless_gap
                     g.height = slaveThei - useless_gap
-                elseif at == centerwork.top_right
+                elseif i - 2 == centerwork.top_right
                 then
                     -- top right
                     g.x = wa.x + slaveLwid + mainwid + useless_gap + global_border
                     g.y = wa.y + useless_gap + global_border
                     g.width = slaveRwid - 2 * useless_gap
                     g.height = slaveThei - useless_gap
-                elseif at == centerwork.bottom_left
+                elseif i - 2 == centerwork.bottom_left
                 then
                     -- bottom left
                     g.x = wa.x + useless_gap + global_border
                     g.y = wa.y + slaveThei + useless_gap + global_border
                     g.width = slaveLwid - 2 * useless_gap
                     g.height = slaveBhei - 2 * useless_gap
-                elseif at == centerwork.bottom_right
+                elseif i - 2 == centerwork.bottom_right
                 then
                     -- bottom right
                     g.x = wa.x + slaveLwid + mainwid + useless_gap + global_border