From c6cfed92d7123eef1c5aa28702d3eea3dcd34226 Mon Sep 17 00:00:00 2001
From: poire-z <poire-z@users.noreply.github.com>
Date: Tue, 29 Aug 2017 17:37:08 +0200
Subject: [PATCH] Fix kobo fl_min and frontlightwidget (#3143)

* Put back fl_min=0 as it is for all other devices (the idea
fl_min should be 1 and toggling managed some other way is
not implemented in current code).
* Fix a few frontlightwidget issues
---
 frontend/device/kobo/powerd.lua         |  4 +--
 frontend/ui/widget/frontlightwidget.lua | 34 ++++++++++++++++---------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/frontend/device/kobo/powerd.lua b/frontend/device/kobo/powerd.lua
index 3fa812213..cdd89d582 100644
--- a/frontend/device/kobo/powerd.lua
+++ b/frontend/device/kobo/powerd.lua
@@ -5,9 +5,7 @@ local batt_state_folder =
         "/sys/devices/platform/pmic_battery.1/power_supply/mc13892_bat/"
 
 local KoboPowerD = BasePowerD:new{
-    -- Do not actively set front light to 0, it may confuse users -- pressing
-    -- hardware button won't take any effect.
-    fl_min = 1, fl_max = 100,
+    fl_min = 0, fl_max = 100,
     fl = nil,
 
     batt_capacity_file = batt_state_folder .. "capacity",
diff --git a/frontend/ui/widget/frontlightwidget.lua b/frontend/ui/widget/frontlightwidget.lua
index f7b1f908d..e32517449 100644
--- a/frontend/ui/widget/frontlightwidget.lua
+++ b/frontend/ui/widget/frontlightwidget.lua
@@ -103,9 +103,23 @@ function FrontLightWidget:setProgress(num, step)
     if num then
         self.fl_cur = num
         set_fl = math.min(self.fl_cur, self.fl_max)
-        Device:getPowerDevice():setIntensity(set_fl)
-        if set_fl == self.fl_max then enable_button_plus = false end
-        if set_fl == self.fl_min then enable_button_minus = false end
+        -- don't touch frontlight on first call (no self[1] means not yet out of update()),
+        -- so that we don't untoggle light
+        if self[1] then
+            local powerd = Device:getPowerDevice()
+            if set_fl == self.fl_min then -- fl_min (which is always 0) means toggle
+                powerd:toggleFrontlight()
+            else
+                powerd:setIntensity(set_fl)
+            end
+            -- get back the real level (different from set_fl if untoggle)
+            self.fl_cur = powerd:frontlightIntensity()
+            -- and update our step_num with it for accurate progress bar
+            step_num = math.floor(self.fl_cur / step)
+        end
+
+        if self.fl_cur == self.fl_max then enable_button_plus = false end
+        if self.fl_cur == self.fl_min then enable_button_minus = false end
 
         for i = step_min, step_num do
             table.insert(fl_group, self.fl_prog_button:new{
@@ -122,8 +136,6 @@ function FrontLightWidget:setProgress(num, step)
                 end
             })
         end
-    else
-        num = 0
     end
 
     for i = step_num + 1, step_min + self.steps -1 do
@@ -139,7 +151,7 @@ function FrontLightWidget:setProgress(num, step)
         enabled = enable_button_minus,
         width = self.screen_width * 0.20,
         show_parent = self,
-        callback = function()  self:setProgress(num - 1, step) end,
+        callback = function()  self:setProgress(self.fl_cur - 1, step) end,
     }
     local button_plus = Button:new{
         text = "+1",
@@ -149,10 +161,10 @@ function FrontLightWidget:setProgress(num, step)
         enabled = enable_button_plus,
         width = self.screen_width * 0.20,
         show_parent = self,
-        callback = function() self:setProgress(num + 1, step) end,
+        callback = function() self:setProgress(self.fl_cur + 1, step) end,
     }
     local item_level = TextBoxWidget:new{
-        text = set_fl,
+        text = self.fl_cur,
         face = self.medium_font_face,
         alignment = "center",
         width = self.screen_width * 0.95 - 1.275 * button_minus.width - 1.275 * button_plus.width,
@@ -165,7 +177,7 @@ function FrontLightWidget:setProgress(num, step)
         enabled = true,
         width = self.screen_width * 0.20,
         show_parent = self,
-        callback = function() self:setProgress(self.fl_min, step) end,
+        callback = function() self:setProgress(self.fl_min+1, step) end, -- min is 1 (use toggle for 0)
     }
     local button_max = Button:new{
         text = _("Max"),
@@ -186,9 +198,7 @@ function FrontLightWidget:setProgress(num, step)
         width = self.screen_width * 0.20,
         show_parent = self,
         callback = function()
-            local powerd = Device:getPowerDevice()
-            powerd:toggleFrontlight()
-            self:setProgress(powerd:frontlightIntensity(), step)
+            self:setProgress(self.fl_min, step)
         end,
     }
     local empty_space = HorizontalSpan:new{