From 7631255071a1acf4d37189fd29acf1b1f0a78e7a Mon Sep 17 00:00:00 2001 From: SomeGuy <97603719+Commodore64user@users.noreply.github.com> Date: Wed, 13 Mar 2024 15:32:21 +0000 Subject: [PATCH] Update screensaver.lua --- frontend/ui/screensaver.lua | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/frontend/ui/screensaver.lua b/frontend/ui/screensaver.lua index f8b0e0a3f..3dcfd26da 100644 --- a/frontend/ui/screensaver.lua +++ b/frontend/ui/screensaver.lua @@ -148,10 +148,12 @@ function Screensaver:expandSpecial(message, fallback) time_left_chapter = self:_calcAverageTimeForPages(ui.toc:getChapterPagesLeft(currentpage) or doc:getTotalPagesLeft(currentpage)) time_left_document = self:_calcAverageTimeForPages(doc:getTotalPagesLeft(currentpage)) end - if currentpage == totalpages then + if currentpage == 1 then + percent = 0 + elseif currentpage == totalpages then percent = 100 else - percent = math.min( Math.round((currentpage * 100) / totalpages), 99) + percent = Math.round(Math.clamp(((currentpage * 100) / totalpages), 1, 99)) end props = ui.doc_props elseif DocSettings:hasSidecarFile(lastfile) then @@ -160,10 +162,12 @@ function Screensaver:expandSpecial(message, fallback) totalpages = doc_settings:readSetting("doc_pages") or totalpages percent = doc_settings:readSetting("percent_finished") or percent currentpage = Math.round(percent * totalpages) - if currentpage == totalpages then + if currentpage == 1 then + percent = 0 + elseif currentpage == totalpages then percent = 100 else - percent = math.min( Math.round(percent * 100), 99) + percent = Math.round(Math.clamp(((currentpage * 100) / totalpages), 1, 99)) end props = FileManagerBookInfo.extendProps(doc_settings:readSetting("doc_props"), lastfile) -- Unable to set time_left_chapter and time_left_document without ReaderUI, so leave N/A