From 4d7d88cfbc5e3f857476f4570bfd3e1ef8a7c8dc Mon Sep 17 00:00:00 2001 From: chrox Date: Mon, 9 Dec 2013 15:58:16 +0800 Subject: [PATCH] page overlap is turned on by default Page overlap added when turning in non-fit-to-page zoom mode is now distinguishable from dim area overlap. --- frontend/ui/reader/readerpaging.lua | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/frontend/ui/reader/readerpaging.lua b/frontend/ui/reader/readerpaging.lua index 61fb08f41..fcf551ec6 100644 --- a/frontend/ui/reader/readerpaging.lua +++ b/frontend/ui/reader/readerpaging.lua @@ -601,22 +601,20 @@ function ReaderPaging:onGotoPageRel(diff) else -- not end of page yet, goto next view -- adjust panning step according to overlap - if self.show_overlap_enable then - if x_pan_off > self.overlap then - -- moving to next view, move view - x_pan_off = x_pan_off - self.overlap - elseif x_pan_off < -self.overlap then - x_pan_off = x_pan_off + self.overlap - end - if y_pan_off > self.overlap then - y_pan_off = y_pan_off - self.overlap - elseif y_pan_off < -self.overlap then - y_pan_off = y_pan_off + self.overlap - end - -- we have to calculate again to count into overlap - new_va.x = Math.roundAwayFromZero(self.visible_area.x+x_pan_off) - new_va.y = Math.roundAwayFromZero(self.visible_area.y+y_pan_off) + if x_pan_off > self.overlap then + -- moving to next view, move view + x_pan_off = x_pan_off - self.overlap + elseif x_pan_off < -self.overlap then + x_pan_off = x_pan_off + self.overlap end + if y_pan_off > self.overlap then + y_pan_off = y_pan_off - self.overlap + elseif y_pan_off < -self.overlap then + y_pan_off = y_pan_off + self.overlap + end + -- we have to calculate again to count into overlap + new_va.x = Math.roundAwayFromZero(self.visible_area.x+x_pan_off) + new_va.y = Math.roundAwayFromZero(self.visible_area.y+y_pan_off) -- fit new view area into page area new_va:offsetWithin(self.page_area, 0, 0) -- calculate panning offsets