From 5b5f6856d30efd916e86bf653eda5035fd2a37dd Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Sun, 17 Feb 2013 13:12:51 +0800 Subject: [PATCH 1/2] fix visible_area recalculate for manual crop in reflow mode --- frontend/ui/reader/readercropping.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/ui/reader/readercropping.lua b/frontend/ui/reader/readercropping.lua index 57d50f9e3..3a674e48c 100644 --- a/frontend/ui/reader/readercropping.lua +++ b/frontend/ui/reader/readercropping.lua @@ -9,7 +9,9 @@ function ReaderCropping:onPageCrop(mode) self.ui:handleEvent(Event:new("CloseConfig")) self.cropping_zoommode = true self.cropping_offset = true - self.ui:handleEvent(Event:new("SetZoomMode", "page")) + -- we are already in page mode, tell ReaderView to recalculate stuff + -- for non-reflow mode + self.view:recalculate() self.cropping_zoommode = false local ubbox = self.document:getPageBBox(self.current_page) --DEBUG("used page bbox", ubbox) From 0d1179a914f765570f73f966fcbe0123b5bfda83 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Mon, 18 Feb 2013 00:01:57 +0800 Subject: [PATCH 2/2] always make sure we switch to page mode in manual cropping --- frontend/ui/reader/readercropping.lua | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/frontend/ui/reader/readercropping.lua b/frontend/ui/reader/readercropping.lua index 3a674e48c..c2d9001f2 100644 --- a/frontend/ui/reader/readercropping.lua +++ b/frontend/ui/reader/readercropping.lua @@ -5,14 +5,17 @@ ReaderCropping = InputContainer:new{} function ReaderCropping:onPageCrop(mode) if mode == "auto" then return end local orig_reflow_mode = self.document.configurable.text_wrap - self.document.configurable.text_wrap = 0 self.ui:handleEvent(Event:new("CloseConfig")) self.cropping_zoommode = true self.cropping_offset = true - -- we are already in page mode, tell ReaderView to recalculate stuff - -- for non-reflow mode - self.view:recalculate() - self.cropping_zoommode = false + if self.document.configurable.text_wrap == 1 then + self.document.configurable.text_wrap = 0 + -- if we are in reflow mode, then we are already in page + -- mode, just force readerview to recalculate visible_area + self.view:recalculate() + else + self.ui:handleEvent(Event:new("SetZoomMode", "page")) + end local ubbox = self.document:getPageBBox(self.current_page) --DEBUG("used page bbox", ubbox) self.crop_bbox = BBoxWidget:new{