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

fix wrong zoom value after returning from cropping dialog

Browse Source
This commit is contained in:
chrox
2013-10-11 23:39:57 +08:00
parent ffd31613a5
commit 2f61b96748
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/ui/reader/readercropping.lua
View File

@@ -98,7 +98,7 @@ function ReaderCropping:onConfirmPageCrop()
--DEBUG("new bbox", new_bbox)
UIManager:close(self.crop_dialog)
local new_bbox = self.bbox_widget:getModifiedPageBBox()
self.ui:handleEvent(Event:new("BBoxUpdate"), new_bbox)
self.ui:handleEvent(Event:new("BBoxUpdate", new_bbox))
local pageno = self.view.state.page
self.document.bbox[pageno] = new_bbox
self.document.bbox[math.oddEven(pageno)] = new_bbox
@@ -119,16 +119,14 @@ function ReaderCropping:exitPageCrop(confirmed)
self.view.page_scroll = self.orig_page_scroll
-- restore view bgcolor
self.view.outer_page_color = self.orig_view_bgcolor
-- restore view dimens
self.ui:handleEvent(Event:new("RestoreDimensions", self.orig_view_dimen))
-- restore reflow mode
self.document.configurable.text_wrap = self.orig_reflow_mode
-- restore view dimens
self.ui:handleEvent(Event:new("RestoreDimensions", self.orig_view_dimen))
self.view:recalculate()
-- Exiting should have the same look and feel with entering.
if self.orig_reflow_mode == 1 then
-- restore original reflow mode
self.document.configurable.text_wrap = 1
self.view:recalculate()
self.ui:handleEvent(Event:new("RestoreZoomMode"))
else
if confirmed then
-- if original zoom mode is not "content", set zoom mode to "contentwidth"

7
frontend/ui/reader/readerzooming.lua
View File

@@ -122,6 +122,12 @@ function ReaderZooming:onSetDimensions(dimensions)
self:setZoom()
end
function ReaderZooming:onRestoreDimensions(dimensions)
-- we were resized
self.dimen = dimensions
self:setZoom()
end
function ReaderZooming:onRotationUpdate(rotation)
self.rotation = rotation
self:setZoom()
@@ -176,6 +182,7 @@ function ReaderZooming:getZoom(pageno)
-- otherwise, operate on full page
self.view:onBBoxUpdate(nil)
page_size = self.ui.document:getNativePageDimensions(pageno)
--page_size = self.ui.document:getPageDimensions(pageno, 1, 0)
end
-- calculate zoom value:
local zoom_w = self.dimen.w / page_size.w