diff options
| -rw-r--r-- | button.lua | 7 | ||||
| -rw-r--r-- | checkbox.lua | 2 | ||||
| -rw-r--r-- | core.lua | 4 | ||||
| -rw-r--r-- | input.lua | 2 | ||||
| -rw-r--r-- | slider.lua | 2 | ||||
| -rw-r--r-- | slider2d.lua | 2 |
6 files changed, 10 insertions, 9 deletions
@@ -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. diff --git a/checkbox.lua b/checkbox.lua index 306fc8f..b51cbb3 100644 --- a/checkbox.lua +++ b/checkbox.lua @@ -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 @@ -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, @@ -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) @@ -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 diff --git a/slider2d.lua b/slider2d.lua index f20a05b..8614113 100644 --- a/slider2d.lua +++ b/slider2d.lua @@ -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 |