Merge branch 'master' into master

2017-09-23 09:46:18 +08:00 · 2017-09-23 09:46:18 +08:00 · 02c4c05a0d
commit 02c4c05a0d
parent 6960a80eaa ecce6820d7
10 changed files with 162 additions and 16 deletions
--- a/input.lua
+++ b/input.lua
@ -49,6 +49,11 @@ return function(core, input, ...)
 	end

 	-- user interaction
+	if input.forcefocus ~= nil and input.forcefocus then
+		core.active = opt.id
+		input.forcefocus = false
+	end
+
 	opt.state = core:registerHitbox(opt.id, x,y,w,h)
 	opt.hasKeyboardFocus = core:grabKeyboardFocus(opt.id)