diff options
author | mkosler <marekkpie@gmail.com> | 2012-02-21 12:50:21 -0600 |
---|---|---|
committer | mkosler <marekkpie@gmail.com> | 2012-02-21 12:50:21 -0600 |
commit | d51babb366d1a46ebe978111ad0b31bfddf95913 (patch) | |
tree | e9ccd0118f73463d657054b9cac3ce1be0f84e0f /style-default.lua | |
parent | 541145560a3b35ad5d37ca76e301c07e32cd4eb0 (diff) | |
parent | a094675a49cf4ab011ddb15fd1bc21632caceb9c (diff) | |
download | Quickie-d51babb366d1a46ebe978111ad0b31bfddf95913.tar.gz Quickie-d51babb366d1a46ebe978111ad0b31bfddf95913.tar.bz2 Quickie-d51babb366d1a46ebe978111ad0b31bfddf95913.tar.xz Quickie-d51babb366d1a46ebe978111ad0b31bfddf95913.zip |
Merge branch 'master' of git://github.com/vrld/Quickie.git
Diffstat (limited to 'style-default.lua')
-rwxr-xr-x | style-default.lua | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/style-default.lua b/style-default.lua index 7c85e46..5ae9dda 100755 --- a/style-default.lua +++ b/style-default.lua @@ -12,10 +12,6 @@ end local function Button(state, title, x,y,w,h) local c = color[state] - if state ~= 'normal' then - love.graphics.setColor(c.fg) - love.graphics.rectangle('fill', x+3,y+3,w,h) - end love.graphics.setColor(c.bg) love.graphics.rectangle('fill', x,y,w,h) love.graphics.setColor(c.fg) @@ -39,10 +35,6 @@ end local function Slider(state, fraction, x,y,w,h, vertical) local c = color[state] - if state ~= 'normal' then - love.graphics.setColor(c.fg) - love.graphics.rectangle('fill', x+3,y+3,w,h) - end love.graphics.setColor(c.bg) love.graphics.rectangle('fill', x,y,w,h) @@ -59,10 +51,6 @@ end local function Slider2D(state, fraction, x,y,w,h, vertical) local c = color[state] - if state ~= 'normal' then - love.graphics.setColor(c.fg) - love.graphics.rectangle('fill', x+3,y+3,w,h) - end love.graphics.setColor(c.bg) love.graphics.rectangle('fill', x,y,w,h) @@ -83,10 +71,6 @@ end local function Input(state, text, cursor, x,y,w,h) local c = color[state] - if state ~= 'normal' then - love.graphics.setColor(c.fg) - love.graphics.rectangle('fill', x+3,y+3,w,h) - end love.graphics.setColor(c.bg) love.graphics.rectangle('fill', x,y,w,h) love.graphics.setColor(c.fg) @@ -107,17 +91,13 @@ end local function Checkbox(state, checked, x,y,w,h) local c = color[state] - if state ~= 'normal' then - love.graphics.setColor(c.fg) - love.graphics.rectangle('fill', x+3,y+3,w,h) - end love.graphics.setColor(c.bg) love.graphics.rectangle('fill', x,y,w,h) love.graphics.setColor(c.fg) love.graphics.rectangle('line', x,y,w,h) if checked then - local r = math.max(math.min(w/2,h/2) - 3, 2) - love.graphics.circle('fill', x+w/2,y+h/2,r) + local r = math.max(math.min(w/7,h/7), 2) + love.graphics.rectangle('fill', x+r,y+r, w-2*r,h-2*r) end end |