len0rd/suit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleaned up and fixed some tab issues

Browse source
This commit is contained in:
zorfmorf 2015-02-12 13:25:32 +01:00
parent 99fade6625
commit 67f1d33ac9
2 changed files with 44 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

9
group.lua
View file

@ -47,7 +47,8 @@ local Grow = {
right = { 1, 0} right = { 1, 0}
} }
-- {grow = grow, spacing = spacing, size = size, pos = pos, draw = draw, border = bool, bkg = bool, padding = padding} -- {grow = grow, spacing = spacing, size = size, pos = pos, draw = draw,
-- border = bool, bkg = bool, padding = padding}
local function push(info) local function push(info)
if not core then core = require(BASE .. 'core') end if not core then core = require(BASE .. 'core') end
@ -112,10 +113,6 @@ local function advance(pos, size)
current.pos[2] = pos[2] + current.grow[2] * (size[2] + current.spacing) current.pos[2] = pos[2] + current.grow[2] * (size[2] + current.spacing)
end end
-- adjust for padding
--pos[1] = pos[1] + current.pad
--pos[2] = pos[2] + current.pad
return pos, size return pos, size
end end
@ -134,7 +131,7 @@ local function getRect(pos, size)
pos[1] = pos[1] + current.pos[1] pos[1] = pos[1] + current.pos[1]
pos[2] = pos[2] + current.pos[2] pos[2] = pos[2] + current.pos[2]
local pos, size = advance(pos, size) pos, size = advance(pos, size)
pos[1] = pos[1] + current.pad pos[1] = pos[1] + current.pad
pos[2] = pos[2] + current.pad pos[2] = pos[2] + current.pad
return pos, size return pos, size