#199 #203 fix attempt 2

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

diff --git a/layout/termfair.lua b/layout/termfair.lua
index 187cb465b6b832e15c8daa6f23eb08fa6da139df..6aca99db900ddc15bb675a06ff617d425a7c2e87 100644 (file)
--- a/layout/termfair.lua
+++ b/layout/termfair.lua
@@ -53,6 +53,8 @@ function termfair.arrange(p)
     -- 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?
     local t = tag.selected(p.screen)
@@ -101,8 +103,8 @@ function termfair.arrange(p)
                 g.height = height - 2*c.border_width
             end
 
-            g.x = wa.x + this_x*width + global_border
-            g.y = wa.y + this_y*height + global_border
+            g.x = wa.x + this_x*width
+            g.y = wa.y + this_y*height
 
             if useless_gap > 0
             then
@@ -111,6 +113,8 @@ function termfair.arrange(p)
                 g.y = g.y + (this_y + 1)*useless_gap
 
             end
+            if g.width < 1 then g.width = 1 end
+            if g.height < 1 then g.height = 1 end
             c:geometry(g)
             remaining_clients = remaining_clients - 1