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

implement full pageturn by viewport for all modes

Browse Source 
* add notIntersectWith method for Geom
* add math.roundAwayFromZero in geometry.lua
* Readerview:recalculate now signals ViewRecalculate event.
  For now, this event is only usefull for ReaderPaging
This commit is contained in:
Qingping Hou
2012-12-03 13:48:41 +08:00
parent 7b707ab367
commit ae1c489a0f
4 changed files with 108 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
frontend/ui/reader/readerpaging.lua
View File

@@ -1,6 +1,8 @@
ReaderPaging = InputContainer:new{
current_page = 0,
number_of_pages = 0
number_of_pages = 0,
visible_area = nil,
page_area = nil,
}
function ReaderPaging:init()
@@ -85,10 +87,21 @@ function ReaderPaging:onReadSettings(config)
self:gotoPage(config:readSetting("last_page") or 1)
end
function ReaderPaging:onZoomModeUpdate(new_mode)
-- we need to remember zoom mode to handle page turn event
self.zoom_mode = new_mode
end
function ReaderPaging:onPageUpdate(new_page_no)
self.current_page = new_page_no
end
function ReaderPaging:onViewRecalculate(visible_area, page_area)
-- we need to remember areas to handle page turn event
self.visible_area = visible_area
self.page_area = page_area
end
function ReaderPaging:onGotoPercent(percent)
DEBUG("goto document offset in percent:", percent)
local dest = math.floor(self.number_of_pages * percent / 100)
@@ -102,7 +115,47 @@ end
function ReaderPaging:onGotoPageRel(diff)
DEBUG("goto relative page:", diff)
self:gotoPage(self.current_page + diff)
local new_va = self.visible_area:copy()
local x_pan_off, y_pan_off = 0, 0
if self.zoom_mode:find("width") then
y_pan_off = self.visible_area.h * diff
elseif self.zoom_mode:find("height") then
x_pan_off = self.visible_area.w * diff
else
-- must be fit content or page zoom mode
if self.visible_area.w == self.page_area.w then
y_pan_off = self.visible_area.h * diff
else
x_pan_off = self.visible_area.w * diff
end
end
-- adjust offset to help with page turn decision
x_pan_off = math.roundAwayFromZero(x_pan_off)
y_pan_off = math.roundAwayFromZero(y_pan_off)
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 (new_va:notIntersectWith(self.page_area)) then
self:gotoPage(self.current_page + diff)
-- if we are going back to previous page, reset
-- view to bottom of previous page
if x_pan_off < 0 then
self.view:PanningUpdate(self.page_area.w, 0)
elseif y_pan_off < 0 then
self.view:PanningUpdate(0, self.page_area.h)
end
else
-- fit new view area into page area
new_va:offsetWithin(self.page_area, 0, 0)
self.view:PanningUpdate(
new_va.x - self.visible_area.x,
new_va.y - self.visible_area.y)
-- update self.visible_area
self.visible_area = new_va
end
return true
end