Minor code quality improvements (#10905)

reviewable/pr11010/r1
François Gannaz 7 months ago committed by GitHub
parent 6e57ccaf4f
commit 11083022b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -287,12 +287,12 @@ function ReaderSearch:onShowSearchDialog(text, direction, regex, case_insensitiv
self.wait_button.movable:setMovedOffset(self.search_dialog.movable:getMovedOffset()) self.wait_button.movable:setMovedOffset(self.search_dialog.movable:getMovedOffset())
UIManager:show(self.wait_button) UIManager:show(self.wait_button)
UIManager:tickAfterNext(function() UIManager:tickAfterNext(function()
do_search(func, pattern, param, regex, case_insensitive)() do_search(func, pattern, param)()
UIManager:close(self.wait_button) UIManager:close(self.wait_button)
end) end)
end end
else else
return do_search(func, pattern, param, regex, case_insensitive) return do_search(func, pattern, param)
end end
end end
self.search_dialog = ButtonDialog:new{ self.search_dialog = ButtonDialog:new{
@ -342,14 +342,14 @@ function ReaderSearch:onShowSearchDialog(text, direction, regex, case_insensitiv
-- initial position: center of the screen -- initial position: center of the screen
UIManager:show(self.wait_button) UIManager:show(self.wait_button)
UIManager:tickAfterNext(function() UIManager:tickAfterNext(function()
do_search(self.searchFromCurrent, text, direction, regex, case_insensitive)() do_search(self.searchFromCurrent, text, direction)()
UIManager:close(self.wait_button) UIManager:close(self.wait_button)
UIManager:show(self.search_dialog) UIManager:show(self.search_dialog)
--- @todo regional --- @todo regional
UIManager:setDirty(self.dialog, "partial") UIManager:setDirty(self.dialog, "partial")
end) end)
else else
do_search(self.searchFromCurrent, text, direction, regex, case_insensitive)() do_search(self.searchFromCurrent, text, direction)()
UIManager:show(self.search_dialog) UIManager:show(self.search_dialog)
--- @todo regional --- @todo regional
UIManager:setDirty(self.dialog, "partial") UIManager:setDirty(self.dialog, "partial")

@ -38,7 +38,7 @@ local function computeCacheSlots()
--- ...otherwise, effectively disable the cache by making it single slot... --- ...otherwise, effectively disable the cache by making it single slot...
if mb_size < 8 then if mb_size < 8 then
logger.dbg(string.format("Setting up a minimal single slot global document cache")) logger.dbg("Setting up a minimal single slot global document cache")
return 1 return 1
else else
return nil return nil

@ -369,7 +369,7 @@ end
function FocusManager:_verticalStep(dy) function FocusManager:_verticalStep(dy)
local x = self.selected.x local x = self.selected.x
if type(self.layout[self.selected.y + dy]) ~= "table" or self.layout[self.selected.y + dy] == {} then if type(self.layout[self.selected.y + dy]) ~= "table" or next(self.layout[self.selected.y + dy]) == nil then
logger.err("[FocusManager] : Malformed layout") logger.err("[FocusManager] : Malformed layout")
return false return false
end end

Loading…
Cancel
Save