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

Fixed the borked select functionality. Also improved the user interface

Browse source 
for core.keyboard.controls.
This commit is contained in:
mkosler 2012-02-21 16:05:03 -06:00
parent 3a414b52e2
commit 7cfe7a0c5d
1 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

36
core.lua
View file

@ -43,9 +43,11 @@ function keyboard.pressed(key, code)
keyboard.code = code
end
function keyboard.controls(up, down)
keyboard.ctrl.up = up
keyboard.ctrl.down = down
function keyboard.controls(up, down, upCode, downCode)
keyboard.ctrl.up.key = up
keyboard.ctrl.down.key = down
keyboard.ctrl.up.code = upCode or -1
keyboard.ctrl.down.code = downCode or -1
end
@ -58,16 +60,28 @@ end
local function makeTabable(id)
keyboard.tryGrab(id)
if hasKeyFocus(id) then
if keyboard.key ~= nil then
print(string.format("Keyboard values: %s, %d | Set control values: (down) %s, %d (up) %s, %d", keyboard.key, keyboard.code, keyboard.ctrl.down.key, keyboard.ctrl.down.code, keyboard.ctrl.up.key, keyboard.ctrl.up.code))
if keyboard.ctrl.up.code ~= -1 then
if keyboard.key == keyboard.ctrl.up.key and keyboard.code == keyboard.ctrl.up.code then
setKeyFocus(context.lastwidget)
keyboard.key = nil
end
else
if keyboard.key == keyboard.ctrl.up.key then
setKeyFocus(context.lastwidget)
keyboard.key = nil
end
end
if keyboard.key == keyboard.ctrl.up.key and keyboard.code == keyboard.ctrl.up.code then
setKeyFocus(context.lastwidget)
elseif keyboard.key == keyboard.ctrl.down.key and keyboard.code == keyboard.ctrl.down.code then
setKeyFocus(nil)
if keyboard.ctrl.down.code ~= -1 then
if keyboard.key == keyboard.ctrl.down.key and keyboard.code == keyboard.ctrl.down.code then
setKeyFocus(nil)
keyboard.key = nil
end
else
if keyboard.key == keyboard.ctrl.down.key then
setKeyFocus(nil)
keyboard.key = nil
end
end
keyboard.key = nil
keyboard.code = -1
end
context.lastwidget = id
end