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 pull request #1021 from chrox/fix_1011

Browse Source 
fix #1011
This commit is contained in:
HW
2014-10-21 12:42:16 +02:00
parent 3c1d2c69df 07ae0cba81
commit 1cb3c85f34
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/apps/reader/modules/readerview.lua
View File

@@ -289,7 +289,7 @@ function ReaderView:getScrollPageRect(page, rect_p)
for _, state in ipairs(self.page_states) do
local trans_p = Geom:new(rect_p):copy()
trans_p:transformByScale(state.zoom, state.zoom)
if page == state.page and state.visible_area:contains(trans_p) then
if page == state.page and state.visible_area:intersectWith(trans_p) then
rect_s.x = rect_s.x + state.offset.x + trans_p.x - state.visible_area.x
rect_s.y = rect_s.y + state.offset.y + trans_p.y - state.visible_area.y
rect_s.w = trans_p.w
@@ -339,7 +339,7 @@ function ReaderView:getSinglePageRect(rect_p)
local rect_s = Geom:new{}
local trans_p = Geom:new(rect_p):copy()
trans_p:transformByScale(self.state.zoom, self.state.zoom)
if self.visible_area:contains(trans_p) then
if self.visible_area:intersectWith(trans_p) then
rect_s.x = self.state.offset.x + trans_p.x - self.visible_area.x
rect_s.y = self.state.offset.y + trans_p.y - self.visible_area.y
rect_s.w = trans_p.w

7
frontend/ui/geometry.lua
View File

@@ -165,6 +165,13 @@ function Geom:notIntersectWith(rect_b)
return false
end
--[[
return true if self geom shares area with rect_b
]]--
function Geom:intersectWith(rect_b)
return not self:notIntersectWith(rect_b)
end
--[[
set size of dimension or rectangle to size of given dimension/rectangle
]]--