Merge pull request #818 from chrox/master

enable Wikipedia support
This commit is contained in:
Qingping Hou
2014-08-20 22:00:25 -07:00
18 changed files with 472 additions and 153 deletions

View File

@@ -41,6 +41,7 @@ function VirtualKey:init()
self.callback = function () self.keyboard:setLayout(self.key or self.label) end
elseif self.label == "Backspace" then
self.callback = function () self.keyboard:delChar() end
self.hold_callback = function () self.keyboard:clear() end
else
self.callback = function () self.keyboard:addChar(self.key) end
end
@@ -83,6 +84,12 @@ function VirtualKey:init()
range = self.dimen,
},
},
HoldSelect = {
GestureRange:new{
ges = "hold",
range = self.dimen,
},
},
}
end
end
@@ -96,6 +103,15 @@ function VirtualKey:onTapSelect()
return true
end
function VirtualKey:onHoldSelect()
self[1].invert = true
if self.hold_callback then
self.hold_callback()
end
UIManager:scheduleIn(0.5, function() self:invert(false) end)
return true
end
function VirtualKey:invert(invert)
self[1].invert = invert
UIManager:setDirty(self.keyboard, "partial")
@@ -191,7 +207,7 @@ function VirtualKeyboard:init()
for i = 1, string.len(GLOBAL_INPUT_VALUE) do
self:addChar(string.sub(GLOBAL_INPUT_VALUE,i,i))
end
end
end
end
function VirtualKeyboard:initLayout(layout)
@@ -303,4 +319,11 @@ function VirtualKeyboard:delChar()
UIManager:setDirty(self.inputbox, "partial")
end
function VirtualKeyboard:clear()
DEBUG("clear input")
self.inputbox:clear()
UIManager:setDirty(self, "partial")
UIManager:setDirty(self.inputbox, "partial")
end
return VirtualKeyboard