Window border width issue fixes in uselessfair

[etc/awesome.git] / layout / uselessfair.lua

diff --git a/layout/uselessfair.lua b/layout/uselessfair.lua
index 6aa6666bd85e777efb4a56885fb6f2516e48ddd6..058dae6660007eb15ce3feba900bb3ebf648c02d 100644 (file)
--- a/layout/uselessfair.lua
+++ b/layout/uselessfair.lua
@@ -1,11 +1,12 @@
 
 --[[
 
 --[[

-                                                  
-     Licensed under GNU General Public License v2 
-      * (c) 2013,      Luke Bonham                
-      * (c) 2012,      Josh Komoroske             
-      * (c) 2010-2012, Peter Hofmann              
-                                                  
+
+     Licensed under GNU General Public License v2
+      * (c) 2014,      projektile
+      * (c) 2013,      Luke Bonham
+      * (c) 2012,      Josh Komoroske
+      * (c) 2010-2012, Peter Hofmann
+

 --]]
 
 local beautiful = require("beautiful")
 --]]
 
 local beautiful = require("beautiful")


@@ -19,10 +20,28 @@ local function fair(p, orientation)
     -- 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
     -- 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
+
+    -- Themes border width requires an offset.
+    local bw = tonumber(beautiful.border_width) or 0
+
+    -- Total window size extend
+    local ext = 2 * bw + useless_gap

 
 

+    -- get our orientation right.

     local wa = p.workarea
     local cls = p.clients
 
     local wa = p.workarea
     local cls = p.clients
 

+    wa.height = wa.height - 2 * global_border - useless_gap
+    wa.width  = wa.width -  2 * global_border - useless_gap
+    wa.x = wa.x + useless_gap + global_border
+    wa.y = wa.y + useless_gap + global_border
+

     if #cls > 0 then
         local cells = math.ceil(math.sqrt(#cls))
         local strips = math.ceil(#cls / cells)
     if #cls > 0 then
         local cells = math.ceil(math.sqrt(#cls))
         local strips = math.ceil(#cls / cells)


@@ -31,10 +50,7 @@ local function fair(p, orientation)
         local strip = 0
         for k, c in ipairs(cls) do
             local g = {}
         local strip = 0
         for k, c in ipairs(cls) do
             local g = {}

-            -- Save actual grid index for use in the useless_gap
-            -- routine.
-            local this_x = 0
-            local this_y = 0
+

             if ( orientation == "east" and #cls > 2 )
             or ( orientation == "south" and #cls <= 2 ) then
                 if #cls < (strips * cells) and strip == strips - 1 then
             if ( orientation == "east" and #cls > 2 )
             or ( orientation == "south" and #cls <= 2 ) then
                 if #cls < (strips * cells) and strip == strips - 1 then


@@ -44,9 +60,6 @@ local function fair(p, orientation)
                 end
                 g.height = wa.height / strips
 
                 end
                 g.height = wa.height / strips
 

-                this_x = cell
-                this_y = strip
-

                 g.x = wa.x + cell * g.width
                 g.y = wa.y + strip * g.height
 
                 g.x = wa.x + cell * g.width
                 g.y = wa.y + strip * g.height
 


@@ -58,39 +71,13 @@ local function fair(p, orientation)
                 end
                 g.width = wa.width / strips
 
                 end
                 g.width = wa.width / strips
 

-                this_x = strip
-                this_y = cell
-

                 g.x = wa.x + strip * g.width
                 g.y = wa.y + cell * g.height
                 g.x = wa.x + strip * g.width
                 g.y = wa.y + cell * g.height

-            end
-
-            -- Useless gap.
-            if useless_gap > 0
-            then
-                -- Top and left clients are shrinked by two steps and
-                -- get moved away from the border. Other clients just
-                -- get shrinked in one direction.
-
-                gap_factor = (useless_gap / 100) * 2

 
 

-                if this_x == 0
-                then
-                    g.width = g.width - (2 + gap_factor) * useless_gap
-                    g.x = g.x + useless_gap
-                else
-                    g.width = g.width - (1 + gap_factor) * useless_gap
-                end
-
-                if this_y == 0
-                then
-                    g.height = g.height - (2 + gap_factor) * useless_gap
-                    g.y = g.y + useless_gap
-                else
-                    g.height = g.height - (1 + gap_factor) * useless_gap
-                end

             end
             end

-            -- End of useless gap.
+
+            g.width = g.width - ext
+            g.height = g.height - ext

 
             c:geometry(g)
 
 
             c:geometry(g)