Revert "update to master"

This reverts commit 10e79ca5c8.
2016-11-06 15:26:19 +08:00 · 2016-11-06 15:26:19 +08:00 · 6960a80eaa
commit 6960a80eaa
parent 10e79ca5c8
3 changed files with 31 additions and 6 deletions
--- a/input.lua
+++ b/input.lua
@ -52,7 +52,7 @@ return function(core, input, ...)
 	opt.state = core:registerHitbox(opt.id, x,y,w,h)
 	opt.hasKeyboardFocus = core:grabKeyboardFocus(opt.id)

-	if opt.hasKeyboardFocus then
+	if (input.candidate_text.text == "") and opt.hasKeyboardFocus then
 		local keycode,char = core:getPressedKey()
 		-- text input
 		if char and char ~= "" then