|
|
|
@ -145,7 +145,7 @@ function ReaderPaging:setupTouchZones()
|
|
|
|
|
screen_zone = forward_zone,
|
|
|
|
|
handler = function()
|
|
|
|
|
if G_reader_settings:nilOrFalse("page_turns_disable_tap") then
|
|
|
|
|
return self:onGotoViewRel(1)
|
|
|
|
|
return self:onPageTurnRel(1)
|
|
|
|
|
end
|
|
|
|
|
end,
|
|
|
|
|
},
|
|
|
|
@ -155,7 +155,7 @@ function ReaderPaging:setupTouchZones()
|
|
|
|
|
screen_zone = backward_zone,
|
|
|
|
|
handler = function()
|
|
|
|
|
if G_reader_settings:nilOrFalse("page_turns_disable_tap") then
|
|
|
|
|
return self:onGotoViewRel(-1)
|
|
|
|
|
return self:onPageTurnRel(-1)
|
|
|
|
|
end
|
|
|
|
|
end,
|
|
|
|
|
},
|
|
|
|
@ -191,6 +191,14 @@ function ReaderPaging:onReadSettings(config)
|
|
|
|
|
self:_gotoPage(config:readSetting("last_page") or 1)
|
|
|
|
|
self.flipping_zoom_mode = config:readSetting("flipping_zoom_mode") or "page"
|
|
|
|
|
self.flipping_scroll_mode = config:isTrue("flipping_scroll_mode")
|
|
|
|
|
self.page_scroll_amount = config:readSetting("kopt_page_scroll_amount")
|
|
|
|
|
or G_reader_settings:readSetting("kopt_page_scroll_amount")
|
|
|
|
|
or 0
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
function ReaderPaging:onPageScrollAmountUpdate(page_scroll_amount)
|
|
|
|
|
self.page_scroll_amount = page_scroll_amount
|
|
|
|
|
return true
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
function ReaderPaging:onSaveSettings()
|
|
|
|
@ -579,6 +587,14 @@ function ReaderPaging:onGotoViewRel(diff)
|
|
|
|
|
return true
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
function ReaderPaging:onPageTurnRel(diff)
|
|
|
|
|
-- handle smooth scroll by default.
|
|
|
|
|
if self.view.page_scroll and self.page_scroll_amount ~= 0 then
|
|
|
|
|
return self:onGotoPosRel(self.page_scroll_amount * diff)
|
|
|
|
|
end
|
|
|
|
|
return self:onGotoViewRel(diff)
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
function ReaderPaging:onGotoPosRel(diff)
|
|
|
|
|
if self.view.page_scroll then
|
|
|
|
|
self:onPanningRel(100*diff)
|
|
|
|
|