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

[fix] PDF footer margins (#5620)

Browse Source 
closes #5612 

the change in `ReaderView:recalculate()` causes the viewable page size to be calculated by not including the footer, causing the text not to get cut off.

since the page area was not drawing under the footer `ReaderView:drawPageSurround()` had to be fixed to draw the margin under the footer so when tapping the footer off the area should be dran the background color.
This commit is contained in:
yparitcher
2019-11-21 04:05:40 -05:00
committed by Frans de Jonge
parent 03fda96041
commit 6d3e7fcef6
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/apps/reader/modules/readerpaging.lua
View File

@@ -766,11 +766,6 @@ function ReaderPaging:onScrollPanRel(diff)
return true
end
function ReaderPaging:calculateOverlap()
local footer_height = (self.view.footer_visible and 1 or 0) * self.view.footer.height
return self.overlap + footer_height
end
function ReaderPaging:onScrollPageRel(page_diff)
if page_diff == 0 then return true end
if page_diff > 0 then
@@ -786,7 +781,7 @@ function ReaderPaging:onScrollPageRel(page_diff)
local blank_area = Geom:new{}
blank_area:setSizeTo(self.view.dimen)
local overlap = self:calculateOverlap()
local overlap = self.overlap
local offset = Geom:new{
x = 0,
y = last_visible_area.h - overlap
@@ -796,7 +791,7 @@ function ReaderPaging:onScrollPageRel(page_diff)
-- page up, first page should be moved to bottom
local blank_area = Geom:new{}
blank_area:setSizeTo(self.view.dimen)
local overlap = self:calculateOverlap()
local overlap = self.overlap
local first_page_state = table.remove(self.view.page_states, 1)
local offset = Geom:new{
x = 0,
@@ -912,7 +907,7 @@ function ReaderPaging:onGotoPageRel(diff)
else
-- not end of page yet, goto next view
-- adjust panning step according to overlap
local overlap = self:calculateOverlap()
local overlap = self.overlap
if x_pan_off > overlap then
-- moving to next view, move view
x_pan_off = x_pan_off - overlap