Merge pull request #37 from almonteb/fix/today

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

diff --git a/layout/uselesstile.lua b/layout/uselesstile.lua
index b82c97e7c9af529ae35c178745fc9f8f24a73fb4..e4965009d4890459012f0d73edb41d2963d2a0cf 100644 (file)
--- a/layout/uselesstile.lua
+++ b/layout/uselesstile.lua
@@ -11,7 +11,7 @@
 local tag       = require("awful.tag")
 local beautiful = require("beautiful")
 local ipairs    = ipairs
 local tag       = require("awful.tag")
 local beautiful = require("beautiful")
 local ipairs    = ipairs

-local math      = { floor = math.floor, 
+local math      = { floor = math.floor,

                     max   = math.max,
                     min   = math.min }
 local tonumber  = tonumber
                     max   = math.max,
                     min   = math.min }
 local tonumber  = tonumber


@@ -21,11 +21,7 @@ local uselesstile = {}
 local function tile_group(cls, wa, orientation, fact, group)
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width .
 local function tile_group(cls, wa, orientation, fact, group)
     -- 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

 
     -- get our orientation right
     local height = "height"
 
     -- get our orientation right
     local height = "height"


@@ -92,6 +88,8 @@ local function tile_group(cls, wa, orientation, fact, group)
             top = false
             left = false
 
             top = false
             left = false
 

+            gap_factor = (useless_gap / 100) * 2
+

             if geom[y] == wa[y] then
                 top = true
             end
             if geom[y] == wa[y] then
                 top = true
             end


@@ -101,17 +99,17 @@ local function tile_group(cls, wa, orientation, fact, group)
             end
 
             if top then
             end
 
             if top then

-                geom[height] = geom[height] - 2 * useless_gap
+                geom[height] = geom[height] - (2 + gap_factor) * useless_gap

                 geom[y] = geom[y] + useless_gap
             else
                 geom[y] = geom[y] + useless_gap
             else

-                geom[height] = geom[height] - useless_gap
+                geom[height] = geom[height] - (1 + gap_factor) * useless_gap 

             end
 
             if left then
             end
 
             if left then

-                geom[width] = geom[width] - 2 * useless_gap
+                geom[width] = geom[width] - (2 + gap_factor) * useless_gap

                 geom[x] = geom[x] + useless_gap
             else
                 geom[x] = geom[x] + useless_gap
             else

-                geom[width] = geom[width] - useless_gap
+                geom[width] = geom[width] - (1 + gap_factor) * useless_gap

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