From 9d041fd5a3b8a15010c41911408c4fd02ffae23e Mon Sep 17 00:00:00 2001
From: chrox <chrox.huang@gmail.com>
Date: Mon, 26 Oct 2015 22:06:52 +0800
Subject: [PATCH 1/2] fix FlushSettings event consumed by statistics plugin so
 that ReaderUI cannot receive that event and all devices don't flush settings
 when going into suspend or background.

---
 plugins/statistics.koplugin/main.lua | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/plugins/statistics.koplugin/main.lua b/plugins/statistics.koplugin/main.lua
index cd9316eb1..a896b123d 100755
--- a/plugins/statistics.koplugin/main.lua
+++ b/plugins/statistics.koplugin/main.lua
@@ -92,7 +92,7 @@ function ReaderStatistics:getStatisticEnabledMenuTable()
             if self.is_enabled then
                 self:initData()
             end
-            self:onSaveSettings()
+            self:saveSettings()
         end,
     }
 end
@@ -138,7 +138,7 @@ function ReaderStatistics:updateSettings()
                     callback = function()
                         self.settings_dialog:onClose()
                         UIManager:close(self.settings_dialog)
-                        self:onSaveSettings(MultiInputDialog:getFields())
+                        self:saveSettings(MultiInputDialog:getFields())
                     end
                 },
             },
@@ -409,20 +409,18 @@ function ReaderStatistics:onAddNote()
 end
 
 -- in case when screensaver starts
-function ReaderStatistics:onFlushSettings()
-    self:onSaveSettings()
+function ReaderStatistics:onSaveSettings()
+    self:saveSettings()
     self:exportToFile()
     self.current_period = 0
-    return true
 end
 
 -- screensaver off
 function ReaderStatistics:onResume()
     self.current_period = 0
-    return true
 end
 
-function ReaderStatistics:onSaveSettings(fields)
+function ReaderStatistics:saveSettings(fields)
     if fields then
         self.page_min_read_sec = tonumber(fields[1])
         self.page_max_read_sec = tonumber(fields[2])

From 394c9cf948119eacfe438c72ab79417c648cb3ce Mon Sep 17 00:00:00 2001
From: chrox <chrox.huang@gmail.com>
Date: Mon, 26 Oct 2015 23:53:07 +0800
Subject: [PATCH 2/2] fix dimen returned by getSize used as dimen in
 inputcontainer

---
 frontend/ui/widget/container/inputcontainer.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/ui/widget/container/inputcontainer.lua b/frontend/ui/widget/container/inputcontainer.lua
index bde01dd09..db8230d15 100644
--- a/frontend/ui/widget/container/inputcontainer.lua
+++ b/frontend/ui/widget/container/inputcontainer.lua
@@ -52,7 +52,8 @@ end
 
 function InputContainer:paintTo(bb, x, y)
     if not self.dimen then
-        self.dimen = self[1]:getSize()
+        local content_size = self[1]:getSize()
+        self.dimen = Geom:new{w = content_size.w, h = content_size.h}
     end
     self.dimen.x = x
     self.dimen.y = y