From b2740808469801482e2d83e640e89c44aa1f1fb9 Mon Sep 17 00:00:00 2001
From: NiLuJe <ninuje@gmail.com>
Date: Mon, 11 Feb 2019 03:28:46 +0100
Subject: [PATCH] Some more repaint/refresh tweaks (#4578)

* ReaderView & ReaderPaging panning should *probably* keep using "partial" ;). (Fix #4575)
* Try to avoid unnecessary footer repaints (mini status bar)
---
 frontend/apps/reader/modules/readerfooter.lua | 33 +++++++++++--------
 frontend/apps/reader/modules/readerpaging.lua |  2 +-
 frontend/apps/reader/modules/readerview.lua   |  4 +--
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/frontend/apps/reader/modules/readerfooter.lua b/frontend/apps/reader/modules/readerfooter.lua
index a94e7e2f5..2ed18e926 100644
--- a/frontend/apps/reader/modules/readerfooter.lua
+++ b/frontend/apps/reader/modules/readerfooter.lua
@@ -229,7 +229,7 @@ end
 function ReaderFooter:setupAutoRefreshTime()
     if not self.autoRefreshTime then
         self.autoRefreshTime = function()
-            self:updateFooter()
+            self:updateFooter(true)
             UIManager:scheduleIn(61 - tonumber(os.date("%S")), self.autoRefreshTime)
         end
     end
@@ -533,33 +533,33 @@ function ReaderFooter:getDataFromStatistics(title, pages)
     return title .. sec
 end
 
-function ReaderFooter:updateFooter()
+function ReaderFooter:updateFooter(force_repaint)
     if self.pageno then
-        self:updateFooterPage()
+        self:updateFooterPage(force_repaint)
     else
-        self:updateFooterPos()
+        self:updateFooterPos(force_repaint)
     end
 end
 
-function ReaderFooter:updateFooterPage()
+function ReaderFooter:updateFooterPage(force_repaint)
     if type(self.pageno) ~= "number" then return end
     self.progress_bar.percentage = self.pageno / self.pages
-    self:updateFooterText()
+    self:updateFooterText(force_repaint)
 end
 
-function ReaderFooter:updateFooterPos()
+function ReaderFooter:updateFooterPos(force_repaint)
     if type(self.position) ~= "number" then return end
     self.progress_bar.percentage = self.position / self.doc_height
-    self:updateFooterText()
+    self:updateFooterText(force_repaint)
 end
 
 -- updateFooterText will start as a noop. After onReaderReady event is
 -- received, it will initialized as _updateFooterText below
-function ReaderFooter:updateFooterText()
+function ReaderFooter:updateFooterText(force_repaint)
 end
 
 -- only call this function after document is fully loaded
-function ReaderFooter:_updateFooterText()
+function ReaderFooter:_updateFooterText(force_repaint)
     self.footer_text:setText(self:genFooterText())
     if self.settings.disable_progress_bar then
         if self.has_no_mode then
@@ -581,9 +581,14 @@ function ReaderFooter:_updateFooterText()
     self.horizontal_group:resetLayout()
     -- NOTE: This is essentially preventing us from truly using "fast" for panning,
     --       since it'll get coalesced in the "fast" panning update, upgrading it to "ui".
-    UIManager:setDirty(self.view.dialog, function()
-        return "ui", self.footer_content.dimen
-    end)
+    -- NOTE: That's assuming using "fast" for pans was a good idea, which, it turned out, not so much ;).
+    -- NOTE: We skip repaints on page turns/pos update, as that's redundant (and slow).
+    if force_repaint then
+        -- NOTE: We need to repaint everything when toggling the progress bar, for some reason.
+        UIManager:setDirty(self.view.dialog, function()
+            return "ui", self.footer_content.dimen
+        end)
+    end
 end
 
 function ReaderFooter:onPageUpdate(pageno)
@@ -686,7 +691,7 @@ function ReaderFooter:onTapFooter(ges)
         self:applyFooterMode()
         G_reader_settings:saveSetting("reader_footer_mode", self.mode)
     end
-    self:updateFooter()
+    self:updateFooter(true)
     return true
 end
 
diff --git a/frontend/apps/reader/modules/readerpaging.lua b/frontend/apps/reader/modules/readerpaging.lua
index b0f74e183..d1dc0699c 100644
--- a/frontend/apps/reader/modules/readerpaging.lua
+++ b/frontend/apps/reader/modules/readerpaging.lua
@@ -715,7 +715,7 @@ function ReaderPaging:onScrollPanRel(diff)
     -- update current pageno to the very last part in current view
     self:_gotoPage(self.view.page_states[#self.view.page_states].page,
                    "scrolling")
-    UIManager:setDirty(self.view.dialog, "fast")
+    UIManager:setDirty(self.view.dialog, "partial")
     return true
 end
 
diff --git a/frontend/apps/reader/modules/readerview.lua b/frontend/apps/reader/modules/readerview.lua
index e8eb28a03..10b2dcbf5 100644
--- a/frontend/apps/reader/modules/readerview.lua
+++ b/frontend/apps/reader/modules/readerview.lua
@@ -610,7 +610,7 @@ function ReaderView:PanningUpdate(dx, dy)
     self.visible_area:offsetWithin(self.page_area, dx, dy)
     if self.visible_area ~= old then
         -- flag a repaint
-        UIManager:setDirty(self.dialog, "fast")
+        UIManager:setDirty(self.dialog, "partial")
         logger.dbg("on pan: page_area", self.page_area)
         logger.dbg("on pan: visible_area", self.visible_area)
         self.ui:handleEvent(
@@ -627,7 +627,7 @@ function ReaderView:PanningStart(x, y)
     self.visible_area = self.panning_visible_area:copy()
     self.visible_area:offsetWithin(self.page_area, x, y)
     self.ui:handleEvent(Event:new("ViewRecalculate", self.visible_area, self.page_area))
-    UIManager:setDirty(self.dialog, "fast")
+    UIManager:setDirty(self.dialog, "partial")
 end
 
 function ReaderView:PanningStop()