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 #510 from chrox/master

Browse Source 
fix conflicts of two finger swipe gesture for flipping mode and showing ...
This commit is contained in:
Qingping Hou
2014-02-14 15:30:37 -05:00
parent 08bee8aa08 68757794a2
commit 21172924fc
1 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,16 +95,6 @@ function ReaderPaging:initGesListener()
}
}
},
TwoFingerSwipe = {
GestureRange:new{
ges = "two_finger_swipe",
range = Geom:new{
x = 0, y = 0,
w = Screen:getWidth(),
h = Screen:getHeight(),
}
}
},
Pan = {
GestureRange:new{
ges = "pan",
@@ -297,9 +287,8 @@ end
function ReaderPaging:onSwipe(arg, ges)
if self.bookmark_flipping_mode then
self:bookmarkFlipping(self.current_page, ges)
elseif self.page_flipping_mode then
self:pageFlipping(self.flipping_page, ges)
self:updateFlippingPage(self.current_page)
elseif self.page_flipping_mode and self.original_page then
self:gotoPage(self.original_page)
elseif ges.direction == "west" then
self:onPagingRel(1)
elseif ges.direction == "east" then
@@ -310,12 +299,6 @@ function ReaderPaging:onSwipe(arg, ges)
return true
end
function ReaderPaging:onTwoFingerSwipe(arg, ges)
if self.original_page then
self:gotoPage(self.original_page)
end
end
function ReaderPaging:onPan(arg, ges)
if self.bookmark_flipping_mode then
return true