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

Hilariously simpler fix for #6616 (#6650)

Browse Source 
* Hilariously simpler fix for #6616

Reverts #6648 for a much, much simpler solution, that will actually
cover every possible situation automagically.
This commit is contained in:
NiLuJe
2020-09-13 19:00:03 +02:00
committed by GitHub
parent e0546d0fc8
commit 592e4f42df
5 changed files with 15 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
frontend/ui/uimanager.lua
View File

@@ -1151,43 +1151,6 @@ function UIManager:widgetRepaint(widget, x, y)
widget:paintTo(Screen.bb, x, y)
end
-- Now, this one is basically widgetRepaint, but tailored for a very,
-- very specific use-case related to ReaderFooter:setupAutoRefreshTime
-- (c.f., #6648)
function UIManager:repaintReaderFooter(readerfooter_widget)
if not readerfooter_widget then return false end
-- Don't repaint if there's another widget than ReaderUI flagged as covers_fullscreen being shown,
-- or if a non-fullscreen widget is flagged as covers_footer.
-- This isn't particularly pretty, but, oh, well (#6616).
local skip_repaint = false
-- c.f., UIManager:_repaint
for i = #self._window_stack, 1, -1 do
local widget = self._window_stack[i].widget
if widget.covers_fullscreen then
if widget.name and widget.name == "ReaderUI" then -- luacheck: ignore
-- NOP (i.e., continue)
else
skip_repaint = true
logger.dbg("Skipping ReaderFooter repaint, because something covers ReaderUI")
break
end
elseif widget.covers_footer then
skip_repaint = true
logger.dbg("Skipping ReaderFooter repaint, because something covers ReaderFooter")
break
end
end
if skip_repaint then return false end
logger.dbg("Explicit ReaderFooter repaint:", readerfooter_widget.name or readerfooter_widget.id or tostring(readerfooter_widget))
-- c.f., ReaderView:paintTo()
readerfooter_widget:paintTo(Screen.bb, 0, 0)
-- Inform the caller that we did, in fact, repaint it.
return true
end
function UIManager:setInputTimeout(timeout)
self.INPUT_TIMEOUT = timeout or 200*1000
end