renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[UX] SkimTo/GoTo: add origin page to location stack (#4162)

Browse Source
This commit is contained in:
poire-z
2018-08-15 15:22:55 +02:00
committed by Frans de Jonge
parent 5f4841e277
commit 48c85e7deb
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/apps/reader/modules/readergoto.lua
View File

@@ -109,6 +109,7 @@ function ReaderGoto:gotoPage()
local relative_sign = page_number:sub(1, 1)
local number = tonumber(page_number)
if number then
self.ui.link:addCurrentLocationToStack()
if relative_sign == "+" or relative_sign == "-" then
self.ui:handleEvent(Event:new("GotoRelativePage", number))
else

18
frontend/apps/reader/skimtowidget.lua
View File

@@ -137,6 +137,7 @@ function SkimToWidget:init()
callback = function()
self.curr_page = self.curr_page - 1
self:update()
self:addOriginToLocationStack()
self.ui:handleEvent(Event:new("GotoPage", self.curr_page))
end,
}
@@ -151,6 +152,7 @@ function SkimToWidget:init()
callback = function()
self.curr_page = self.curr_page - 10
self:update()
self:addOriginToLocationStack()
self.ui:handleEvent(Event:new("GotoPage", self.curr_page))
end,
}
@@ -165,6 +167,7 @@ function SkimToWidget:init()
callback = function()
self.curr_page = self.curr_page + 1
self:update()
self:addOriginToLocationStack()
self.ui:handleEvent(Event:new("GotoPage", self.curr_page))
end,
}
@@ -179,6 +182,7 @@ function SkimToWidget:init()
callback = function()
self.curr_page = self.curr_page + 10
self:update()
self:addOriginToLocationStack()
self.ui:handleEvent(Event:new("GotoPage", self.curr_page))
end,
}
@@ -208,6 +212,7 @@ function SkimToWidget:init()
local page = self:getNextChapter(self.curr_page)
if page and page >=1 and page <= self.page_count then
self.curr_page = page
self:addOriginToLocationStack()
self.ui:handleEvent(Event:new("GotoPage", self.curr_page))
self:update()
end
@@ -226,6 +231,7 @@ function SkimToWidget:init()
local page = self:getPrevChapter(self.curr_page)
if page and page >=1 and page <= self.page_count then
self.curr_page = page
self:addOriginToLocationStack()
self.ui:handleEvent(Event:new("GotoPage", self.curr_page))
self:update()
end
@@ -248,6 +254,7 @@ function SkimToWidget:init()
page = self.ui.bookmark:getNextBookmarkedPageFromPage(self.curr_page)
end
if page then
self:addOriginToLocationStack()
self.ui.bookmark:gotoBookmark(page)
if self.document.info.has_pages then
self.curr_page = self.ui.paging.current_page
@@ -275,6 +282,7 @@ function SkimToWidget:init()
page = self.ui.bookmark:getPreviousBookmarkedPageFromPage(self.curr_page)
end
if page then
self:addOriginToLocationStack()
self.ui.bookmark:gotoBookmark(page)
if self.document.info.has_pages then
self.curr_page = self.ui.paging.current_page
@@ -362,6 +370,15 @@ function SkimToWidget:update()
self.current_page_text:setText(self.curr_page, self.current_page_text.width)
end
function SkimToWidget:addOriginToLocationStack(add_current)
-- Only add the page from which we launched the SkimToWidget
-- to the location stack, unless add_current = true
if not self.orig_page_added_to_stack or add_current then
self.ui.link:addCurrentLocationToStack()
self.orig_page_added_to_stack = true
end
end
function SkimToWidget:getNextChapter(cur_pageno)
local next_chapter = nil
for i = 1, #self.ticks_candidates do
@@ -409,6 +426,7 @@ function SkimToWidget:onTapProgress(arg, ges_ev)
local pos = ges_ev.pos.x - self.progress_bar.dimen.x
local perc = pos / width
local page = Math.round(perc * self.page_count)
self:addOriginToLocationStack()
self.ui:handleEvent(Event:new("GotoPage", page ))
self.curr_page = page
self:update()