From cd52704b6216750f836fc86985c7027db700c371 Mon Sep 17 00:00:00 2001 From: chrox Date: Mon, 18 Mar 2013 16:07:07 +0800 Subject: [PATCH 1/2] remove original page when toggling flip mode off --- frontend/ui/reader/readerpaging.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/ui/reader/readerpaging.lua b/frontend/ui/reader/readerpaging.lua index e317ed241..fd1012326 100644 --- a/frontend/ui/reader/readerpaging.lua +++ b/frontend/ui/reader/readerpaging.lua @@ -142,6 +142,8 @@ function ReaderPaging:onToggleFlipping() self.flipping_page = self.current_page if self.flipping_mode then self:updateOriginalPage(self.current_page) + else + self:updateOriginalPage(nil) end self.ui:handleEvent(Event:new("SetHinting", not self.flipping_mode)) UIManager:setDirty(self.view.dialog, "partial") From a16dba8daa81f6b488c9da0e7df7ea487b5be0ed Mon Sep 17 00:00:00 2001 From: chrox Date: Mon, 18 Mar 2013 17:08:01 +0800 Subject: [PATCH 2/2] rewind current page after initiating the scroll page states --- frontend/ui/reader/readerpaging.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/ui/reader/readerpaging.lua b/frontend/ui/reader/readerpaging.lua index fd1012326..90cf8435b 100644 --- a/frontend/ui/reader/readerpaging.lua +++ b/frontend/ui/reader/readerpaging.lua @@ -210,7 +210,9 @@ end function ReaderPaging:onPageUpdate(new_page_no, orig) self.current_page = new_page_no - self.ui:handleEvent(Event:new("InitScrollPageStates", orig)) + if orig ~= "scrolling" then + self.ui:handleEvent(Event:new("InitScrollPageStates", orig)) + end end function ReaderPaging:onViewRecalculate(visible_area, page_area) @@ -241,8 +243,8 @@ end function ReaderPaging:onInitScrollPageStates(orig) DEBUG("init scroll page states") - if orig == "scrolling" then return true end if self.view.page_scroll then + self.orig_page = self.current_page self.view.page_states = {} local blank_area = Geom:new{} blank_area:setSizeTo(self.view.dimen) @@ -257,6 +259,7 @@ function ReaderPaging:onInitScrollPageStates(orig) self:gotoPage(self.current_page + 1, "scrolling") end end + self:gotoPage(self.orig_page, "scrolling") end return true end