From 68757794a236eb80aa14929544b2815310d6f7dd Mon Sep 17 00:00:00 2001 From: chrox Date: Fri, 14 Feb 2014 23:56:35 +0800 Subject: [PATCH] fix conflicts of two finger swipe gesture for flipping mode and showing TOC/Bookmark --- frontend/ui/reader/readerpaging.lua | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/frontend/ui/reader/readerpaging.lua b/frontend/ui/reader/readerpaging.lua index 6eeef86e1..91aa3657f 100644 --- a/frontend/ui/reader/readerpaging.lua +++ b/frontend/ui/reader/readerpaging.lua @@ -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