X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/6cc550655fad64e784ff87916f3ef439ebaf4c4a..6c40d0ffc7b154e12ce60a0ff52c5b84d142e805:/layout/centerfair.lua

diff --git a/layout/centerfair.lua b/layout/centerfair.lua
index 49b4a14..5022726 100644
--- a/layout/centerfair.lua
+++ b/layout/centerfair.lua
@@ -1,11 +1,12 @@
 
 --[[
-                                                  
-     Licensed under GNU General Public License v2 
-      * (c) 2013,      Luke Bonham                
-      * (c) 2010,      Nicolas Estibals           
-      * (c) 2010-2012, Peter Hofmann              
-                                                  
+                                                 
+     Licensed under GNU General Public License v2
+      * (c) 2014,      projektile                
+      * (c) 2013,      Luke Bonham               
+      * (c) 2010,      Nicolas Estibals          
+      * (c) 2010-2012, Peter Hofmann             
+                                                 
 --]]
 
 local tag       = require("awful.tag")
@@ -41,45 +42,59 @@ function centerfair.arrange(p)
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width .
     local useless_gap = tonumber(beautiful.useless_gap_width) or 0
+    if useless_gap < 0 then useless_gap = 0 end
+
+    -- A global border can be defined with
+    -- beautiful.global_border_width
+    local global_border = tonumber(beautiful.global_border_width) or 0
+    if global_border < 0 then global_border = 0 end
 
     -- Screen.
     local wa = p.workarea
     local cls = p.clients
 
+    -- Borders are factored in.
+    wa.height = wa.height - (global_border * 2)
+    wa.width = wa.width - (global_border * 2)
+    wa.x = wa.x + global_border
+    wa.y = wa.y + global_border
+
     -- How many vertical columns? Read from nmaster on the tag.
     local t = tag.selected(p.screen)
     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
 
-    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)
 
-    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 - 1)*useless_gap) / 2
         local g = {}
-        g.width = width
-        g.height = wa.height - 2*useless_gap - 2
-        g.y = offset_y
+        g.y = wa.y + useless_gap
         for i = 1, #cls do
-            g.x = offset_x + (i - 1) * (width + useless_gap + 2)
-            cls[i]:geometry(g)
+            local c = cls[i]
+            g.width = width - 2*c.border_width
+            g.height = wa.height - 2*useless_gap - 2*c.border_width
+            if g.width < 1 then g.width = 1 end
+            if g.height < 1 then g.height = 1 end
+            g.x = offset_x + (i - 1) * (width + useless_gap)
+            c:geometry(g)
         end
     else
         -- More clients than the number of columns, let's arrange it!
-        local offset_x = wa.x 
-        if useless_gap > 0 then
-           offset_x = offset_x 
-        end
-
         -- Master client deserves a special treatement
+        local c = cls[1]
         local g = {}
-        g.width = wa.width - (num_x-1)*width -num_x*useless_gap - 2
-        g.height = wa.height - 2*useless_gap - 2
-        g.x = offset_x + useless_gap
-        g.y = offset_y
-        cls[1]:geometry(g)
+        g.width = wa.width - (num_x - 1)*width - (num_x + 1)*useless_gap - 2*c.border_width
+        g.height = wa.height - 2*useless_gap - 2*c.border_width
+        if g.width < 1 then g.width = 1 end
+        if g.height < 1 then g.height = 1 end
+        g.x = wa.x + useless_gap
+        g.y = wa.y + useless_gap
+
+        c:geometry(g)
 
         -- Treat the other clients
 
@@ -118,28 +133,30 @@ function centerfair.arrange(p)
         end
 
         -- Compute geometry of the other clients
-        local nclient = 2
-        g.x = g.x + g.width+useless_gap + 2
-        g.width = width
-
-        if useless_gap > 0 then
-            g.width = g.width - useless_gap/2 - 2
-        end
+        local nclient = 2 -- we start with the 2nd client
+        g.x = g.x + g.width + useless_gap + 2*c.border_width
 
         for i = 1, (num_x-1) do
-            to_remove = 2
-            g.height = math.floor((wa.height-useless_gap)/num_y[i]) 
-            g.y = offset_y
+            local height = math.floor((wa.height - (num_y[i] + 1)*useless_gap) / num_y[i])
+            g.y = wa.y + useless_gap
             for j = 0, (num_y[i]-2) do
-                cls[nclient]:geometry(g)
+                local c = cls[nclient]
+                g.height = height - 2*c.border_width
+                g.width = width - 2*c.border_width
+                if g.width < 1 then g.width = 1 end
+                if g.height < 1 then g.height = 1 end
+                c:geometry(g)
                 nclient = nclient + 1
-                g.y = g.y + g.height+useless_gap + 2
-                to_remove = to_remove + 2
+                g.y = g.y + height + useless_gap
             end
-            g.height = wa.height - num_y[i]*useless_gap - (num_y[i]-1)*g.height - useless_gap - to_remove
-            cls[nclient]:geometry(g)
+            local c = cls[nclient]
+            g.height = wa.height - (num_y[i] + 1)*useless_gap - (num_y[i] - 1)*height - 2*c.border_width
+            g.width = width - 2*c.border_width
+            if g.width < 1 then g.width = 1 end
+            if g.height < 1 then g.height = 1 end
+            c:geometry(g)
             nclient = nclient + 1
-            g.x = g.x+g.width+useless_gap + 2
+            g.x = g.x + width + useless_gap
         end
     end
 end