Rename makeTabable() to makeCyclable()

This commit is contained in:
Matthias Richter 2012-02-22 23:33:54 +01:00
parent d6ed0f9301
commit 370c10c787
6 changed files with 10 additions and 9 deletions

View file

@ -13,9 +13,10 @@ return function(title, x,y, w,h, draw)
-- core.mouse.updateState(id, x,y,w,h) updates the state for this widget.
core.mouse.updateState(id, x,y,w,h)
-- core.makeTabable makes the item focus on tab. Tab order is determied
-- by the order you call the widget functions.
core.makeTabable(id)
-- core.makeCyclable makes the item focus on tab or whatever binding is
-- in place (see core.keyboard.cycle). Cycle order is determied by the
-- order you call the widget functions.
core.makeCyclable(id)
-- core.registerDraw(id, drawfunction, drawfunction-arguments...)
-- shows widget when core.draw() is called.

View file

@ -4,7 +4,7 @@ return function(info, x,y, w,h, draw)
local id = core.generateID()
core.mouse.updateState(id, x,y,w,h)
core.makeTabable(id)
core.makeCyclable(id)
core.registerDraw(id, draw or core.style.Checkbox, info.checked,x,y,w,h)
local checked = info.checked

View file

@ -59,7 +59,7 @@ function keyboard.isBindingDown(bind)
return keyboard.key == bind.key and modifiersDown
end
local function makeTabable(id)
local function makeCyclable(id)
keyboard.tryGrab(id)
if hasKeyFocus(id) then
if keyboard.isBindingDown(keyboard.cycle.prev) then
@ -146,7 +146,7 @@ return {
isHot = isHot,
isActive = isActive,
hasKeyFocus = hasKeyFocus,
makeTabable = makeTabable,
makeCyclable = makeCyclable,
style = require((...):match("(.-)[^%.]+$") .. '.style-default'),
color = color,

View file

@ -6,7 +6,7 @@ return function(info, x,y,w,h, draw)
local id = core.generateID()
core.mouse.updateState(id, x,y,w,h)
core.makeTabable(id)
core.makeCyclable(id)
if core.isActive(id) then core.setKeyFocus(id) end
core.registerDraw(id, draw or core.style.Input, info.text, info.cursor, x,y,w,h)

View file

@ -9,7 +9,7 @@ return function(info, x,y,w,h, draw)
local id = core.generateID()
core.mouse.updateState(id, x,y,w,h)
core.makeTabable(id)
core.makeCyclable(id)
core.registerDraw(id,draw or core.style.Slider, fraction, x,y,w,h, info.vertical)
-- mouse update

View file

@ -12,7 +12,7 @@ return function(info, x,y,w,h, draw)
local id = core.generateID()
core.mouse.updateState(id, x,y,w,h)
core.makeTabable(id)
core.makeCyclable(id)
core.registerDraw(id,draw or core.style.Slider2D, fraction, x,y,w,h)
-- update value