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

Merge 5244ac8dcf into 1767782603

Browse source
This commit is contained in:
flightmansam 2021-09-03 23:12:19 +10:00 • committed by GitHub
commit 798d0b9362
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
slider.lua
View file

@ -18,7 +18,7 @@ return function(core, info, ...)
if core:isActive(opt.id) then if core:isActive(opt.id) then
-- mouse update -- mouse update
local mx,my = core:getMousePosition() local mx,my = core:getMousePosition()
if opt.vertical then if opt.id.vertical then
fraction = math.min(1, math.max(0, (y+h - my) / h)) fraction = math.min(1, math.max(0, (y+h - my) / h))
else else
fraction = math.min(1, math.max(0, (mx - x) / w)) fraction = math.min(1, math.max(0, (mx - x) / w))
@ -30,8 +30,8 @@ return function(core, info, ...)
end end
-- keyboard update -- keyboard update
local key_up = opt.vertical and 'up' or 'right' local key_up = opt.id.vertical and 'up' or 'right'
local key_down = opt.vertical and 'down' or 'left' local key_down = opt.id.vertical and 'down' or 'left'
if core:getPressedKey() == key_up then if core:getPressedKey() == key_up then
info.value = math.min(info.max, info.value + info.step) info.value = math.min(info.max, info.value + info.step)
value_changed = true value_changed = true

4
theme.lua
View file

@ -83,7 +83,7 @@ end
function theme.Slider(fraction, opt, x,y,w,h) function theme.Slider(fraction, opt, x,y,w,h)
local xb, yb, wb, hb -- size of the progress bar local xb, yb, wb, hb -- size of the progress bar
local r = math.min(w,h) / 2.1 local r = math.min(w,h) / 2.1
if opt.vertical then if opt.id.vertical == true then
x, w = x + w*.25, w*.5 x, w = x + w*.25, w*.5
xb, yb, wb, hb = x, y+h*(1-fraction), w, h*fraction xb, yb, wb, hb = x, y+h*(1-fraction), w, h*fraction
else else
@ -97,7 +97,7 @@ function theme.Slider(fraction, opt, x,y,w,h)
if opt.state ~= nil and opt.state ~= "normal" then if opt.state ~= nil and opt.state ~= "normal" then
love.graphics.setColor((opt.color and opt.color.active or {}).fg or theme.color.active.fg) love.graphics.setColor((opt.color and opt.color.active or {}).fg or theme.color.active.fg)
if opt.vertical then if opt.id.vertical then
love.graphics.circle('fill', x+wb/2, yb, r) love.graphics.circle('fill', x+wb/2, yb, r)
else else
love.graphics.circle('fill', x+wb, yb+hb/2, r) love.graphics.circle('fill', x+wb, yb+hb/2, r)