Merge branch 'master' into master

This commit is contained in:
Yx 2017-09-23 09:46:18 +08:00 committed by GitHub
commit 02c4c05a0d
10 changed files with 162 additions and 16 deletions

View file

@ -19,7 +19,7 @@ function theme.getColorForState(opt)
end
function theme.drawBox(x,y,w,h, colors, cornerRadius)
local colors = colors or theme.getColorForState(opt)
colors = colors or theme.getColorForState(opt)
cornerRadius = cornerRadius or theme.cornerRadius
w = math.max(cornerRadius/2, w)
if h < cornerRadius/2 then