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

Korean keyboard: unwrap InputText on layout change

Browse Source 
The korean keyboard wraps InputText and overrides some
of its methods to process input in some specific way.
When switching to another keyboard layout, the original
methods need to be restored.
This commit is contained in:
poire-z
2019-11-25 14:31:52 +01:00
parent 7b4b06f557
commit 13fa6d962c
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
frontend/ui/data/keyboardlayouts/ko_KR_keyboard.lua
View File

@@ -26,9 +26,21 @@ local wrapInputBox = function(inputbox)
if inputbox._wrapped == nil then
inputbox._wrapped = true
-- helper function
-- helper functions
local copied_names = {}
local function restore_func_references(obj)
for __, name in ipairs(copied_names) do
local orig_name = "_" .. name
if obj[orig_name] then
obj[name] = obj[orig_name]
obj[orig_name] = nil
end
end
end
local function copy_func_reference(obj, name)
obj["_" .. name] = obj[name]
table.insert(copied_names, name)
end
-- override original implementations with helper object
@@ -82,6 +94,11 @@ local wrapInputBox = function(inputbox)
wrap_touch_event_func_with_hghelper_reset(inputbox, "onTapTextBox")
wrap_touch_event_func_with_hghelper_reset(inputbox, "onHoldTextBox")
wrap_touch_event_func_with_hghelper_reset(inputbox, "onSwipeTextBox")
return function() -- return unwrap function
restore_func_references(inputbox)
inputbox._wrapped = nil
end
end
end

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

@@ -666,6 +666,10 @@ local VirtualKeyboard = FocusManager:new{
}
function VirtualKeyboard:init()
if self.uwrap_func then
self.uwrap_func()
self.uwrap_func = nil
end
local lang = self:getKeyboardLayout()
local keyboard_layout = self.lang_to_keyboard_layout[lang] or self.lang_to_keyboard_layout["en"]
local keyboard = require("ui/data/keyboardlayouts/" .. keyboard_layout)
@@ -685,7 +689,7 @@ function VirtualKeyboard:init()
self.key_events.Close = { {"Back"}, doc = "close keyboard" }
end
if keyboard.wrapInputBox then
keyboard.wrapInputBox(self.inputbox)
self.uwrap_func = keyboard.wrapInputBox(self.inputbox) or self.uwrap_func
end
end