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

ReaderZooming tweaks (#7968)

Browse Source 
* ReaderZooming tweaks

Re #7964 & #7962

* Fix oversight in setNumberOf

Co-authored-by: yparitcher <y@paritcher.com>
This commit is contained in:
NiLuJe
2021-07-15 15:34:13 +02:00
committed by GitHub
parent ab6867c8fa
commit 72fbdf7fd4
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/apps/reader/modules/readerzooming.lua
View File

@@ -371,11 +371,12 @@ function ReaderZooming:onDefineZoom(btn, when_applied_callback)
if zoom_mode == "columns" or zoom_mode == "rows" then
if btn ~= "columns" and btn ~= "rows" then
self.ui:handleEvent(Event:new("SetZoomPan", settings, true))
settings.kopt_zoom_factor = self:setNumberOf(
config.zoom_factor = self:setNumberOf(
zoom_mode,
zoom_range_number,
zoom_mode == "columns" and settings.zoom_overlap_h or settings.zoom_overlap_v
)
settings.kopt_zoom_factor = config.zoom_factor
end
elseif zoom_mode == "manual" then
if btn == "manual" then
@@ -658,7 +659,7 @@ function ReaderZooming:setNumberOf(what, num, overlap)
zoom_factor = zoom_factor * zoom_h / zoom_w
end
self.ui:handleEvent(Event:new("SetZoomPan", {kopt_zoom_factor = zoom_factor}))
self.ui:handleEvent(Event:new("RedrawCurrentPage"))
return zoom_factor
end
function ReaderZooming:_zoomFactorChange(title_text, direction, precision)
@@ -704,6 +705,11 @@ function ReaderZooming:onSetZoomPan(settings, no_redraw)
for k, v in pairs(settings) do
self[k] = v
self.ui.doc_settings:saveSetting(k, v)
-- Configurable keys aren't prefixed...
local configurable_key = k:gsub("^kopt_", "")
if self.ui.document.configurable[configurable_key] then
self.ui.document.configurable[configurable_key] = v
end
end
if not no_redraw then
self.ui:handleEvent(Event:new("RedrawCurrentPage"))