merge and resolve conflicts from #134; #114

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

diff --git a/layout/cascade.lua b/layout/cascade.lua
index 999c599efeb6042391c7a00499bd1568f37604e6..3d7598b4c9380c3833424a7e9ff02d2c26ecf05c 100644 (file)
--- a/layout/cascade.lua
+++ b/layout/cascade.lua
@@ -28,15 +28,12 @@ function cascade.arrange(p)
     local global_border = tonumber(beautiful.global_border_width) or 0
     if global_border < 0 then global_border = 0 end
 
     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
-

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

-    wa.height = wa.height - ((global_border * 2) + (bw * 2))
-    wa.width = wa.width - ((global_border * 2) + (bw * 2))
+    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
 
     wa.x = wa.x + global_border
     wa.y = wa.y + global_border
 


@@ -70,8 +67,10 @@ function cascade.arrange(p)
 
         g.x = wa.x + (how_many - i) * cascade.offset_x
         g.y = wa.y + (i - 1) * cascade.offset_y
 
         g.x = wa.x + (how_many - i) * cascade.offset_x
         g.y = wa.y + (i - 1) * cascade.offset_y

-        g.width = wa.width - current_offset_x
-        g.height = wa.height - current_offset_y
+        g.width = wa.width - current_offset_x - 2*c.border_width
+        g.height = wa.height - current_offset_y - 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)
     end
 
         c:geometry(g)
     end