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

Random optimizations (#9657)

Browse Source
This commit is contained in:
zwim
2022-10-28 07:51:27 +02:00
committed by GitHub
parent e72211a5bf
commit d7c63edca6
3 changed files with 23 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/apps/reader/modules/readerhighlight.lua
View File

@@ -2072,5 +2072,4 @@ function ReaderHighlight:_createHighlightGesture(gesture)
}
end
return ReaderHighlight

14
frontend/device/devicelistener.lua
View File

@@ -318,17 +318,9 @@ function DeviceListener:onRestart()
self.ui.menu:exitOrRestart(function() UIManager:restartKOReader() end)
end
function DeviceListener:onRequestSuspend()
UIManager:suspend()
end
function DeviceListener:onRequestReboot()
UIManager:reboot()
end
function DeviceListener:onRequestPowerOff()
UIManager:powerOff()
end
DeviceListener.onRequestSuspend = UIManager.suspend
DeviceListener.onRequestReboot = UIManager.reboot
DeviceListener.onRequestPowerOff = UIManager.powerOff
function DeviceListener:onExit(callback)
self.ui.menu:exitOrRestart(callback)

45
frontend/ui/uimanager.lua
View File

@@ -196,20 +196,22 @@ function UIManager:close(widget, refreshtype, refreshregion, refreshdither)
table.remove(self._window_stack, i)
dirty = true
else
-- If anything else on the stack not already hidden by (i.e., below) a fullscreen widget was dithered, honor the hint
if w.dithered and not is_covered then
refreshdither = true
logger.dbg("Lower widget", w.name or w.id or tostring(w), "was dithered, honoring the dithering hint")
end
if not is_covered then
-- If anything else on the stack not already hidden by (i.e., below) a fullscreen widget was dithered, honor the hint
if w.dithered then
refreshdither = true
logger.dbg("Lower widget", w.name or w.id or tostring(w), "was dithered, honoring the dithering hint")
end
-- Remember the uppermost widget that covers the full screen, so we don't bother calling setDirty on hidden (i.e., lower) widgets in the following dirty loop.
-- _repaint already does that later on to skip the actual paintTo calls, so this ensures we limit the refresh queue to stuff that will actually get painted.
if not is_covered and w.covers_fullscreen then
is_covered = true
start_idx = i
logger.dbg("Lower widget", w.name or w.id or tostring(w), "covers the full screen")
if i > 1 then
logger.dbg("not refreshing", i-1, "covered widget(s)")
-- Remember the uppermost widget that covers the full screen, so we don't bother calling setDirty on hidden (i.e., lower) widgets in the following dirty loop.
-- _repaint already does that later on to skip the actual paintTo calls, so this ensures we limit the refresh queue to stuff that will actually get painted.
if w.covers_fullscreen then
is_covered = true
start_idx = i
logger.dbg("Lower widget", w.name or w.id or tostring(w), "covers the full screen")
if i > 1 then
logger.dbg("not refreshing", i-1, "covered widget(s)")
end
end
end
@@ -677,10 +679,7 @@ function UIManager:getTopWidget()
end
local widget = self._window_stack[#self._window_stack].widget
if widget.name then
return widget.name
end
return widget
return widget.name or widget
end
--[[--
@@ -691,7 +690,7 @@ Useful when VirtualKeyboard is involved, as it *always* steals the top spot ;).
NOTE: Will skip over VirtualKeyboard instances, plural, in case there are multiple (because, apparently, we can do that.. ugh).
--]]
function UIManager:getSecondTopmostWidget()
if #self._window_stack <= 1 then
if #self._window_stack < 2 then
-- Not enough widgets in the stack, bye!
return nil
end
@@ -748,16 +747,12 @@ function UIManager:quit(exit_code)
self._exit_code = exit_code or self._exit_code or 0
logger.info("quitting uimanager with exit code:", self._exit_code)
self._task_queue_dirty = false
for i = #self._window_stack, 1, -1 do
table.remove(self._window_stack, i)
end
for i = #self._task_queue, 1, -1 do
table.remove(self._task_queue, i)
end
self._window_stack = {}
self._task_queue = {}
for i = #self._zeromqs, 1, -1 do
self._zeromqs[i]:stop()
table.remove(self._zeromqs, i)
end
self._zeromqs = {}
if self.looper then
self.looper:close()
self.looper = nil