From: Moussab <mbennehar@gmail.com>
Date: Mon, 10 Nov 2014 22:46:57 +0000 (+0100)
Subject: Update centerfair.lua
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/faecd881fc44b5a045bc86f2101b89e2999d6521

Update centerfair.lua
---

diff --git a/layout/centerfair.lua b/layout/centerfair.lua
index 37507d3..d3225b4 100644
--- a/layout/centerfair.lua
+++ b/layout/centerfair.lua
@@ -65,7 +65,6 @@ function centerfair.arrange(p)
     local num_x = centerfair.nmaster or tag.getnmaster(t)
     local ncol = centerfair.ncol or tag.getncol(t)
     if num_x <= 2 then num_x = 2 end
-    if num_x > #cls then num_x = #cls end
 
     local width = math.floor((wa.width-(num_x+1)*useless_gap) / num_x)
 
@@ -79,7 +78,7 @@ function centerfair.arrange(p)
         g.height = wa.height - 2*useless_gap - 2
         g.y = offset_y + global_border
         for i = 1, #cls do
-            g.x = offset_x + (i - 1) * (width + useless_gap + 2) + global_border
+            g.x = offset_x + (#cls - i) * (width + useless_gap + 2) + global_border
             cls[i]:geometry(g)
         end
     else
@@ -96,9 +95,7 @@ function centerfair.arrange(p)
         g.x = offset_x + useless_gap + global_border
         g.y = offset_y + global_border
 
-        if cls[1] then
-            cls[1]:geometry(g)
-        end
+        cls[#cls]:geometry(g)
 
         -- Treat the other clients
 
@@ -107,7 +104,7 @@ function centerfair.arrange(p)
         do
             local remaining_clients = #cls-1
             local ncol_min = math.ceil(remaining_clients/(num_x-1))
-            if ncol >= ncol_min
+            if ncol >= ncol_min 
             then
                 for i = (num_x-1), 1, -1 do
                     if (remaining_clients-i+1) < ncol
@@ -137,7 +134,7 @@ function centerfair.arrange(p)
         end
 
         -- Compute geometry of the other clients
-        local nclient = 2
+        local nclient = #cls-1 -- we start with the 2nd client
         g.x = g.x + g.width+useless_gap + 2
         g.width = width
 
@@ -149,15 +146,15 @@ function centerfair.arrange(p)
             to_remove = 2
             g.height = math.floor((wa.height - (num_y[i] * useless_gap)) / num_y[i])
             g.y = offset_y + global_border
-            for j = 0, (num_y[i]-2) do
+            for j = 1, (num_y[i]-1) do
                 cls[nclient]:geometry(g)
-                nclient = nclient + 1
+                nclient = nclient - 1
                 g.y = g.y + g.height+useless_gap + 2
                 to_remove = to_remove + 2
             end
             g.height = wa.height - num_y[i]*useless_gap - (num_y[i]-1)*g.height - useless_gap - to_remove
             cls[nclient]:geometry(g)
-            nclient = nclient + 1
+            nclient = nclient - 1
             g.x = g.x+g.width+useless_gap + 2
         end
     end