From 2104bb6f9839cceefae1758495d6d3b6119f6e29 Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Tue, 27 Aug 2019 14:07:14 +0200 Subject: [PATCH] [fix] Distinguish bookmark/page flipping in menu (#5266) Fixes . --- frontend/apps/reader/modules/readerbookmark.lua | 2 +- frontend/apps/reader/modules/readerpaging.lua | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/apps/reader/modules/readerbookmark.lua b/frontend/apps/reader/modules/readerbookmark.lua index d620253c0..e9c4f6443 100644 --- a/frontend/apps/reader/modules/readerbookmark.lua +++ b/frontend/apps/reader/modules/readerbookmark.lua @@ -51,7 +51,7 @@ function ReaderBookmark:addToMainMenu(menu_items) if self.ui.document.info.has_pages then menu_items.bookmark_browsing_mode = { text = self.bbm_menu_title, - checked_func = function() return self.view.flipping_visible end, + checked_func = function() return self.ui.paging.bookmark_flipping_mode end, callback = function(touchmenu_instance) self:enableBookmarkBrowsingMode() touchmenu_instance:closeMenu() diff --git a/frontend/apps/reader/modules/readerpaging.lua b/frontend/apps/reader/modules/readerpaging.lua index dba3a79c9..ce038a6ca 100644 --- a/frontend/apps/reader/modules/readerpaging.lua +++ b/frontend/apps/reader/modules/readerpaging.lua @@ -273,6 +273,10 @@ function ReaderPaging:getPagePosition(page) end function ReaderPaging:onTogglePageFlipping() + if self.bookmark_flipping_mode then + self:onToggleBookmarkFlipping() + return + end self.view.flipping_visible = not self.view.flipping_visible self.page_flipping_mode = self.view.flipping_visible self.flipping_page = self.current_page @@ -290,7 +294,7 @@ function ReaderPaging:onTogglePageFlipping() end function ReaderPaging:onToggleBookmarkFlipping() - self.bookmark_flipping_mode = not self.bookmark_flipping_mode + self.bookmark_flipping_mode = not self.bookmark_flipping_mode if self.bookmark_flipping_mode then self.orig_flipping_mode = self.view.flipping_visible