renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[feat] Support callback function in VirtualKeyPopup (#5588)

Browse Source 
Required for <https://github.com/koreader/koreader/pull/5583>.
This commit is contained in:
Frans de Jonge
2019-11-11 23:10:27 +01:00
committed by GitHub
parent 35154b8d56
commit 2855fdfdac
1 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
frontend/ui/widget/virtualkeyboard.lua
View File

@@ -81,7 +81,14 @@ function VirtualKey:init()
}
end
self.swipe_callback = function(ges)
self.keyboard:addChar(self.key_chars[ges.direction])
local key_string = self.key_chars[ges.direction]
local key_function = self.key_chars[ges.direction.."_func"]
if not key_function and key_string then
self.keyboard:addChar(key_string)
elseif key_function then
key_function()
end
end
end
@@ -315,27 +322,41 @@ function VirtualKeyPopup:init()
local parent_key = self.parent_key
local key_chars = parent_key.key_chars
local key_char_orig = key_chars[1]
local key_char_orig_func = parent_key.callback
local rows = {
extra_key_chars = {
key_chars[2],
key_chars[3],
key_chars[4],
-- _func equivalent for unnamed extra keys
key_chars[5],
key_chars[6],
key_chars[7],
},
top_key_chars = {
key_chars.northwest,
key_chars.north,
key_chars.northeast,
key_chars.northwest_func,
key_chars.north_func,
key_chars.northeast_func,
},
middle_key_chars = {
key_chars.west,
key_char_orig,
key_chars.east,
key_chars.west_func,
key_char_orig_func,
key_chars.east_func,
},
bottom_key_chars = {
key_chars.southwest,
key_chars.south,
key_chars.southeast,
key_chars.southwest_func,
key_chars.south_func,
key_chars.southeast_func,
},
}
if util.tableSize(rows.extra_key_chars) == 0 then rows.extra_key_chars = nil end
@@ -368,6 +389,7 @@ function VirtualKeyPopup:init()
for i = 1,3 do
local v = chars[i]
local v_func = chars[i+3]
if v then
columns[i] = true
@@ -384,6 +406,10 @@ function VirtualKeyPopup:init()
width = parent_key.width,
height = parent_key.height,
}
-- Support any function as a callback.
if v_func then
virtual_key.callback = v_func
end
-- don't open another popup on hold
virtual_key.hold_callback = nil
-- close popup on hold release