MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ThiagoLira/develop' into develop 

Also fixed whitespace from #1251

Closes #1186
develop
lethosor 2018-04-04 17:12:06 -04:00
parent 1ac896a874 b7bd88352e
commit 5081710900
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/lua/gui.lua
Unescape Escape View File

@ -109,6 +109,7 @@ local function parse_inset(inset)
end end
function inset_frame(rect, inset, gap) function inset_frame(rect, inset, gap)
if not rect then return mkdims_wh(0, 0, 0, 0) end
gap = gap or 0 gap = gap or 0
local l,t,r,b = parse_inset(inset) local l,t,r,b = parse_inset(inset)
return mkdims_xy(rect.x1+l+gap, rect.y1+t+gap, rect.x2-r-gap, rect.y2-b-gap) return mkdims_xy(rect.x1+l+gap, rect.y1+t+gap, rect.x2-r-gap, rect.y2-b-gap)