InputContainer/FocusManager: Simplify key_events clearing on unplug

Thanks to @poire-z for the idea, it's indeed much nicer this way ;).
This commit is contained in:
NiLuJe
2022-11-01 23:22:07 +01:00
parent d585cd5d86
commit 925fd647dc
19 changed files with 66 additions and 141 deletions

View File

@@ -56,7 +56,7 @@ function ReaderMenu:init()
self.registered_widgets = {}
self:registerKeyEvents(true)
self:registerKeyEvents()
if G_reader_settings:has("activate_menu") then
self.activation_menu = G_reader_settings:readSetting("activate_menu")
@@ -70,7 +70,7 @@ end
function ReaderMenu:onGesture() end
function ReaderMenu:registerKeyEvents(init)
function ReaderMenu:registerKeyEvents()
if Device:hasKeys() then
if Device:isTouchDevice() then
self.key_events.TapShowMenu = { { "Menu" } }
@@ -85,14 +85,10 @@ function ReaderMenu:registerKeyEvents(init)
self.key_events.ShowMenu = { { { "Menu", "Right" } } }
end
end
elseif not init then
self.key_events.TapShowMenu = nil
self.key_events.ShowMenu = nil
end
end
ReaderMenu.onPhysicalKeyboardConnected = ReaderMenu.registerKeyEvents
ReaderMenu.onPhysicalKeyboardDisconnected = ReaderMenu.registerKeyEvents
function ReaderMenu:getPreviousFile()
return require("readhistory"):getPreviousFile(self.ui.document.file)