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

Merge remote-tracking branch 'dpavlin/two-column-recalculate-pan' into dpavlin-twocolumn

Browse Source
This commit is contained in:
Tigran Aivazian
2012-09-27 11:41:21 +01:00
parent cc1ab45b1c fe2517ecd2
commit 68c95e4bb2
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
unireader.lua
View File

@@ -1297,10 +1297,19 @@ function UniReader:setzoom(page, preCache)
self.offset_y = -1 * y0 * self.globalzoom * 2 + margin
self.globalzoom = width / (x1 - x0 + margin) * 2
Debug("column mode offset:", self.offset_x, self.offset_y, " zoom:", self.globalzoom);
self.pan_by_page = self.globalzoom_mode -- store for later and enable pan_by_page
self.globalzoom_mode = self.ZOOM_BY_VALUE -- enable pan mode
self.pan_x = self.offset_x
self.pan_y = self.offset_y
self.pan_by_page = true
else
Debug("globalzoom_mode didn't modify params", self.globalzoom_mode)
end
if self.adjust_offset then
Debug("self.ajdust_offset BEFORE ", self.globalzoom, " globalrotate:", self.globalrotate, " offset:", self.offset_x, self.offset_y, " pagesize:", self.fullwidth, self.fullheight, " min_offset:", self.min_offset_x, self.min_offset_y)
self.adjust_offset(self)
self.adjust_offset = nil
Debug("self.ajdust_offset AFTER ", self.globalzoom, " globalrotate:", self.globalrotate, " offset:", self.offset_x, self.offset_y, " pagesize:", self.fullwidth, self.fullheight, " min_offset:", self.min_offset_x, self.min_offset_y)
end
dc:setZoom(self.globalzoom)
@@ -1545,9 +1554,8 @@ function UniReader:nextView()
-- not in fit to content width pan mode, just do a page turn
pageno = pageno + 1
if self.pan_by_page then
-- we are in two column mode
self.offset_x = self.pan_x
self.offset_y = self.pan_y
Debug("two-column pan_by_page", self.pan_by_page)
self.globalzoom_mode = self.pan_by_page
end
end
@@ -1576,9 +1584,8 @@ function UniReader:prevView()
-- not in fit to content width pan mode, just do a page turn
pageno = pageno - 1
if self.pan_by_page then
-- we are in two column mode
self.offset_x = self.pan_x
self.offset_y = self.pan_y
Debug("two-column pan_by_page", self.pan_by_page)
self.globalzoom_mode = self.pan_by_page
end
end
@@ -2753,8 +2760,11 @@ function UniReader:addAllCommands()
unireader.offset_x = unireader.offset_x + x
if unireader.pan_by_page then
if unireader.offset_x > 0 and unireader.pageno > 1 then
unireader.offset_x = unireader.pan_x
unireader.offset_y = unireader.min_offset_y -- bottom
unireader.adjust_offset = function(unireader)
unireader.offset_x = unireader.pan_x
unireader.offset_y = unireader.min_offset_y
Debug("pan to right-bottom of previous page")
end
unireader:goto(unireader.pageno - 1)
else
unireader.show_overlap = 0
@@ -2768,8 +2778,8 @@ function UniReader:addAllCommands()
unireader.offset_x = unireader.offset_x - x
if unireader.pan_by_page then
if unireader.offset_x < unireader.min_offset_x - unireader.pan_margin and unireader.pageno < unireader.doc:getPages() then
unireader.offset_x = unireader.pan_x
unireader.offset_y = unireader.pan_y
Debug("pan to top-left of next page")
self.globalzoom_mode = self.pan_by_page
unireader:goto(unireader.pageno + 1)
else
unireader.show_overlap = 0