From b1a80921addf6525aa5326118f704751826228a1 Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Wed, 3 Apr 2024 19:04:27 +0200 Subject: [PATCH] Revert "ReaderPaging: enable Kindle page-turn animations (#11424)" (#11617) This reverts commit ee7c3ab551f320ff0095c276bdadfac77beeee69. --- frontend/apps/reader/modules/readerpaging.lua | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/frontend/apps/reader/modules/readerpaging.lua b/frontend/apps/reader/modules/readerpaging.lua index 431e4e982..3bf67199e 100644 --- a/frontend/apps/reader/modules/readerpaging.lua +++ b/frontend/apps/reader/modules/readerpaging.lua @@ -565,7 +565,7 @@ function ReaderPaging:onGotoPercent(percent) if dest > self.number_of_pages then dest = self.number_of_pages end - self:onGotoPage(dest) + self:_gotoPage(dest) return true end @@ -575,7 +575,6 @@ function ReaderPaging:onGotoViewRel(diff) else self:onGotoPageRel(diff) end - self.ui:handleEvent(Event:new("PageChangeAnimation", diff > 0)) self:setPagePosition(self:getTopPage(), self:getTopPosition()) return true end @@ -1128,11 +1127,8 @@ function ReaderPaging:_gotoPage(number, orig_mode) end function ReaderPaging:onGotoPage(number, pos) - local same_page = number == self.current_page; - local animation_direction = number > self.current_page; self:setPagePosition(number, 0) self:_gotoPage(number) - self.ui:handleEvent(Event:new("PageChangeAnimation", animation_direction)) if pos then local rect_p = Geom:new{ x = pos.x or 0, y = pos.y or 0 } local rect_s = Geom:new(rect_p):copy() @@ -1142,7 +1138,7 @@ function ReaderPaging:onGotoPage(number, pos) else self.view:PanningUpdate(rect_s.x - self.view.visible_area.x, rect_s.y - self.view.visible_area.y) end - elseif same_page then + elseif number == self.current_page then -- gotoPage emits this event only if the page changes self.ui:handleEvent(Event:new("PageUpdate", self.current_page)) end @@ -1161,14 +1157,14 @@ function ReaderPaging:onGotoRelativePage(number) end new_page = test_page end - self:onGotoPage(new_page) + self:_gotoPage(new_page) return true end function ReaderPaging:onGotoPercentage(percentage) if percentage < 0 then percentage = 0 end if percentage > 1 then percentage = 1 end - self:onGotoPage(math.floor(percentage*self.number_of_pages)) + self:_gotoPage(math.floor(percentage*self.number_of_pages)) return true end