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

Dict, Trapper: prevent dismissal by past events

Browse Source 
Add UIManager:discardEvents(), to allow dropping events
for a period of time.
Default duration of 600ms on eInk, 300ms otherwise.
Used when showing the dict result window, so that a tap
happening just when it's being shown won't discard it.
Used with Trapper:confirm()/:info(), to avoid taps made
in a previous processing to dismiss (and so, select the
cancel action) a ConfirmBox not yet painted/visible.
This commit is contained in:
poire-z
2021-01-01 14:34:55 +01:00
parent b6323f15fc
commit 6205f26047
5 changed files with 67 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
frontend/ui/trapper.lua
View File

@@ -165,6 +165,9 @@ function Trapper:info(text, fast_refresh)
ok_callback = function()
coroutine.resume(_coroutine, false)
end,
-- flush any pending tap, so past events won't be considered
-- action on the yet to be displayed widget
flush_events_on_show = true,
}
UIManager:show(abort_box)
-- no need to forceRePaint, UIManager will do it when we yield()
@@ -186,10 +189,6 @@ function Trapper:info(text, fast_refresh)
-- continue processing
end
--- @todo We should try to flush any pending tap, so past
-- events won't be considered action on the yet to be displayed
-- widget
-- If fast_refresh option, avoid UIManager refresh overhead
if fast_refresh and self.current_widget and self.current_widget.is_infomessage then
local orig_moved_offset = self.current_widget.movable:getMovedOffset()
@@ -214,7 +213,10 @@ function Trapper:info(text, fast_refresh)
dismiss_callback = function()
coroutine.resume(_coroutine, false)
end,
is_infomessage = true -- flag on our InfoMessages
is_infomessage = true, -- flag on our InfoMessages
-- flush any pending tap, so past events won't be considered
-- action on the yet to be displayed widget
flush_events_on_show = true,
}
logger.dbg("Showing InfoMessage:", text)
UIManager:show(self.current_widget)
@@ -268,10 +270,6 @@ function Trapper:confirm(text, cancel_text, ok_text)
return true -- always select "OK" in ConfirmBox if no UI
end
--- @todo We should try to flush any pending tap, so past
-- events won't be considered action on the yet to be displayed
-- widget
-- Close any previous widget
if self.current_widget then
UIManager:close(self.current_widget)
@@ -289,6 +287,9 @@ function Trapper:confirm(text, cancel_text, ok_text)
ok_callback = function()
coroutine.resume(_coroutine, true)
end,
-- flush any pending tap, so past events won't be considered
-- action on the yet to be displayed widget
flush_events_on_show = true,
}
logger.dbg("Showing ConfirmBox and waiting for answer:", text)
UIManager:show(self.current_widget)