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

Revamp ToC ticks handling (#6716)

Browse Source 
Replace the level `0` `getTocTicks` heuristic with a simple sorted, deduped flat listing of *every* ToC node (via `getTocTicksFlattened`).
This commit is contained in:
NiLuJe
2020-09-27 22:25:16 +02:00
committed by GitHub
parent 25d5e9322c
commit 1ac5846eff
5 changed files with 133 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/apps/reader/modules/readerfooter.lua
View File

@@ -196,8 +196,7 @@ local footerTextGeneratorMap = {
pages_left = function(footer)
local symbol_type = footer.settings.item_prefix or "icons"
local prefix = symbol_prefix[symbol_type].pages_left
local left = footer.ui.toc:getChapterPagesLeft(
footer.pageno, footer.toc_level)
local left = footer.ui.toc:getChapterPagesLeft(footer.pageno)
return prefix .. " " .. (left and left or footer.pages - footer.pageno)
end,
percentage = function(footer)
@@ -221,8 +220,7 @@ local footerTextGeneratorMap = {
chapter_time_to_read = function(footer)
local symbol_type = footer.settings.item_prefix or "icons"
local prefix = symbol_prefix[symbol_type].chapter_time_to_read
local left = footer.ui.toc:getChapterPagesLeft(
footer.pageno, footer.toc_level)
local left = footer.ui.toc:getChapterPagesLeft(footer.pageno)
return footer:getDataFromStatistics(
prefix .. " ", (left and left or footer.pages - footer.pageno))
end,
@@ -294,7 +292,6 @@ local ReaderFooter = WidgetContainer:extend{
mode = MODE.page_progress,
pageno = nil,
pages = nil,
toc_level = 0,
progress_percentage = 0.0,
footer_text = nil,
text_font_face = "ffont",
@@ -1676,7 +1673,7 @@ function ReaderFooter:setTocMarkers(reset)
end
self.progress_bar.ticks = {}
if self.ui.toc then
self.progress_bar.ticks = self.ui.toc:getTocTicksForFooter()
self.progress_bar.ticks = self.ui.toc:getTocTicksFlattened()
end
self.progress_bar.last = self.pages or self.view.document:getPageCount()
else