X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/7a4d6f5ffa594603ef83bc8b0e9945d12e082490..62acc707f6daaccedeab99426875e81c3eaf5c11:/layout/uselesspiral.lua?ds=sidebyside diff --git a/layout/uselesspiral.lua b/layout/uselesspiral.lua index 695728c..3164c75 100644 --- 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 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 @@ -68,27 +64,29 @@ local function spiral(p, spiral) top = false left = false + gap_factor = (useless_gap / 100) * 2 + if wa2.y == static_wa.y then - top = true + top = true 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 - 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 - 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.