Merge remote-tracking branch 'upstream/master'

resolved conflicts with refactored structure
This commit is contained in:
HW
2013-10-22 17:19:08 +02:00
14 changed files with 74 additions and 19 deletions

View File

@@ -98,6 +98,10 @@ function InputText:getKeyboardDimen()
end
function InputText:addChar(char)
if self.enter_callback and char == '\n' then
UIManager:scheduleIn(0.1, function() self.enter_callback() end)
return
end
table.insert(self.charlist, self.charpos, char)
self.charpos = self.charpos + 1
self.text = self:CharlistToString()