Adding scrolling support to the calendar

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

diff --git a/layout/uselesspiral.lua b/layout/uselesspiral.lua
index 695728c328ba45cb022a15d9abf5da0cf49d7e99..3164c7597ea9d2d0a003a5361d125d8b9b450c02 100644 (file)
--- a/layout/uselesspiral.lua
+++ b/layout/uselesspiral.lua
@@ -17,11 +17,7 @@ local uselesspiral = {}
 local function spiral(p, spiral)
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width.
 local function spiral(p, spiral)
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width.

-    local useless_gap = tonumber(beautiful.useless_gap_width)
-    if useless_gap == nil
-    then
-        useless_gap = 0
-    end
+    local useless_gap = tonumber(beautiful.useless_gap_width) or 0

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


@@ -68,27 +64,29 @@ local function spiral(p, spiral)
             top = false
             left = false
 
             top = false
             left = false
 

+            gap_factor = (useless_gap / 100) * 2
+

             if wa2.y == static_wa.y then
             if wa2.y == static_wa.y then

-                 top = true
+               top = true

             end
 
             if wa2.x == static_wa.x then
             end
 
             if wa2.x == static_wa.x then

-                 left = true
+               left = true
+            end
+
+            if top then
+                wa2.height = wa2.height - (2 + gap_factor) * useless_gap
+                wa2.y = wa2.y + useless_gap
+            else
+                wa2.height = wa2.height - (1 + gap_factor) * useless_gap

             end
 
             end
 

-           if top then
-                 wa2.height = wa2.height - 2 * useless_gap
-                  wa2.y = wa2.y + useless_gap
+            if left then
+                wa2.width = wa2.width - (2 + gap_factor) * useless_gap
+                wa2.x = wa2.x + useless_gap

             else
             else

-                 wa2.height = wa2.height - useless_gap
-           end
-
-           if left then
-                         wa2.width = wa2.width - 2 * useless_gap
-                  wa2.x = wa2.x + useless_gap
-           else
-                 wa2.width = wa2.width - useless_gap
-           end
+                wa2.width = wa2.width - (1 + gap_factor) * useless_gap
+            end

         end
         -- End of useless gap.
 
         end
         -- End of useless gap.