From c2f2e617ad2dc519d028522e785c14ea171f7730 Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Thu, 8 Mar 2012 00:38:34 +0100 Subject: [PATCH] correct bbox loading and Shift+Z removes page bbox this moves #35 a *little* bit closer to release ;-) --- unireader.lua | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/unireader.lua b/unireader.lua index 70dffbb04..82223766e 100644 --- a/unireader.lua +++ b/unireader.lua @@ -115,6 +115,10 @@ function UniReader:loadSettings(filename) local jumpstack = self.settings:readsetting("jumpstack") self.jump_stack = jumpstack or {} + local bbox = self.settings:readsetting("bbox") + print("# bbox loaded "..dump(bbox)) + self.bbox = bbox + return true end return false @@ -125,10 +129,6 @@ function UniReader:initGlobalSettings(settings) if pan_overlap_vertical then self.pan_overlap_vertical = pan_overlap_vertical end - local bbox = settings:readsetting("bbox") - if bbox then - self.bbox = bbox - end end -- guarantee that we have enough memory in cache @@ -607,7 +607,6 @@ end -- wait for input and handle it function UniReader:inputloop() local keep_running = true - self.bbox = {} while 1 do local ev = input.waitForEvent() ev.code = adjustKeyEvents(ev) @@ -695,7 +694,7 @@ function UniReader:inputloop() keep_running = false end break - elseif ev.code == KEY_Z then + elseif ev.code == KEY_Z and not Keys.shiftmode then local bbox = {} bbox["x0"] = - self.offset_x / self.globalzoom bbox["y0"] = - self.offset_y / self.globalzoom @@ -705,6 +704,9 @@ function UniReader:inputloop() self.bbox[self:odd_even(self.pageno)] = bbox print("# bbox " .. self.pageno .. dump(self.bbox)) self.globalzoommode = self.ZOOM_FIT_TO_CONTENT -- use bbox + elseif ev.code == KEY_Z and Keys.shiftmode then + self.bbox[self.pageno] = nil; + print("# bbox remove "..self.pageno .. dump(self.bbox)); end -- switch to ZOOM_BY_VALUE to enable panning on fiveway move