diff --git a/frontend/apps/reader/modules/readerpaging.lua b/frontend/apps/reader/modules/readerpaging.lua index 48ea66911..e87a9d625 100644 --- a/frontend/apps/reader/modules/readerpaging.lua +++ b/frontend/apps/reader/modules/readerpaging.lua @@ -290,7 +290,6 @@ function ReaderPaging:onSwipe(arg, ges) else UIManager.full_refresh = true end - return true end function ReaderPaging:onPan(arg, ges) diff --git a/frontend/apps/reader/modules/readerrolling.lua b/frontend/apps/reader/modules/readerrolling.lua index 2ce38e2b6..d718c8991 100644 --- a/frontend/apps/reader/modules/readerrolling.lua +++ b/frontend/apps/reader/modules/readerrolling.lua @@ -188,7 +188,6 @@ function ReaderRolling:onSwipe(arg, ges) elseif ges.direction == "east" or ges.direction == "south" then self:onGotoViewRel(-1) end - return true end function ReaderRolling:onPan(arg, ges) diff --git a/frontend/apps/reader/modules/readerscreenshot.lua b/frontend/apps/reader/modules/readerscreenshot.lua index 32e0ca60a..a615abf9f 100644 --- a/frontend/apps/reader/modules/readerscreenshot.lua +++ b/frontend/apps/reader/modules/readerscreenshot.lua @@ -15,13 +15,20 @@ function ReaderScreenshot:init() math.pow(Screen:getHeight(), 2) ) self.ges_events = { - Screenshot = { + TapDiagonal = { GestureRange:new{ ges = "two_finger_tap", scale = {diagonal - Screen:scaleByDPI(200), diagonal}, rate = 1.0, } }, + SwipeDiagonal = { + GestureRange:new{ + ges = "swipe", + scale = {diagonal - Screen:scaleByDPI(200), diagonal}, + rate = 1.0, + } + }, } end @@ -41,4 +48,12 @@ function ReaderScreenshot:onScreenshot() return true end +function ReaderScreenshot:onTapDiagonal() + return self:onScreenshot() +end + +function ReaderScreenshot:onSwipeDiagonal() + return self:onScreenshot() +end + return ReaderScreenshot diff --git a/frontend/document/credocument.lua b/frontend/document/credocument.lua index f163e9aec..094d71716 100644 --- a/frontend/document/credocument.lua +++ b/frontend/document/credocument.lua @@ -55,7 +55,7 @@ function CreDocument:engineInit() self:cacheInit() -- initialize hyph dictionaries - cre.initHyphDict("./data/hyph") + cre.initHyphDict("./data/hyph/") -- we need to initialize the CRE font list local fonts = Font:getFontList() diff --git a/frontend/ui/gesturerange.lua b/frontend/ui/gesturerange.lua index b1c1ca092..2ae6a3c61 100644 --- a/frontend/ui/gesturerange.lua +++ b/frontend/ui/gesturerange.lua @@ -35,7 +35,8 @@ function GestureRange:match(gs) end end if self.scale then - if self.scale[1] > gs.span or self.scale[2] < gs.span then + local scale = gs.distance or gs.span + if self.scale[1] > scale or self.scale[2] < scale then return false end end