Merge pull request #63 from daineseh/master

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

diff --git a/layout/termfair.lua b/layout/termfair.lua
index 4beab8f25cdb96cc145c6046304aa67f636c29bb..89a44bbd0e9e3145b2df77448e44e13663cb541b 100644 (file)
--- a/layout/termfair.lua
+++ b/layout/termfair.lua
@@ -89,27 +89,32 @@ function termfair.arrange(p)
             else
                 g.height = height
             end
             else
                 g.height = height
             end

+

             g.x = wa.x + this_x * width
             g.y = wa.y + this_y * height
             g.x = wa.x + this_x * width
             g.y = wa.y + this_y * height

+

             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.
             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
                 if this_x == 0
                 then

-                    g.width = g.width - 2 * useless_gap
+                    g.width = g.width - (2 + gap_factor) * useless_gap

                     g.x = g.x + useless_gap
                 else
                     g.x = g.x + useless_gap
                 else

-                    g.width = g.width - useless_gap
+                    g.width = g.width - (1 + gap_factor) * useless_gap

                 end
 
                 if this_y == 0
                 then
                 end
 
                 if this_y == 0
                 then

-                    g.height = g.height - 2 * useless_gap
+                    g.height = g.height - (2 + gap_factor) * useless_gap

                     g.y = g.y + useless_gap
                 else
                     g.y = g.y + useless_gap
                 else

-                    g.height = g.height - useless_gap
+                    g.height = g.height - (1 + gap_factor) * useless_gap

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