Fix #17: Support multiple instances
This commit is contained in:
parent
f77ab8e5e8
commit
aca8a297bb
14 changed files with 385 additions and 244 deletions
15
button.lua
15
button.lua
|
@ -1,9 +1,8 @@
|
|||
-- This file is part of SUIT, copyright (c) 2016 Matthias Richter
|
||||
|
||||
local BASE = (...):match('(.-)[^%.]+$')
|
||||
local core = require(BASE .. 'core')
|
||||
|
||||
return function(text, ...)
|
||||
return function(core, text, ...)
|
||||
local opt, x,y,w,h = core.getOptionsAndSize(...)
|
||||
opt.id = opt.id or text
|
||||
opt.font = opt.font or love.graphics.getFont()
|
||||
|
@ -11,14 +10,14 @@ return function(text, ...)
|
|||
w = w or opt.font:getWidth(text) + 4
|
||||
h = h or opt.font:getHeight() + 4
|
||||
|
||||
core.registerHitbox(opt.id, x,y,w,h)
|
||||
core.registerDraw(core.theme.Button, text, opt, x,y,w,h)
|
||||
opt.state = core:registerHitbox(opt.id, x,y,w,h)
|
||||
core:registerDraw(core.theme.Button, text, opt, x,y,w,h)
|
||||
|
||||
return {
|
||||
id = opt.id,
|
||||
hit = core.mouseReleasedOn(opt.id),
|
||||
hovered = core.isHot(opt.id),
|
||||
entered = core.isHot(opt.id) and not core.wasHot(opt.id),
|
||||
left = not core.isHot(opt.id) and core.wasHot(opt.id)
|
||||
hit = core:mouseReleasedOn(opt.id),
|
||||
hovered = core:isHovered(opt.id),
|
||||
entered = core:isHovered(opt.id) and not core:wasHovered(opt.id),
|
||||
left = not core:isHovered(opt.id) and core:wasHovered(opt.id)
|
||||
}
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue