From fdbab3e11d5ead2da4c6dff867fdd5dfa05a49c8 Mon Sep 17 00:00:00 2001
From: Robert <robert.styla@gmail.com>
Date: Sat, 3 Dec 2016 21:21:31 +0100
Subject: [PATCH] frontlightwidget(fix): prog_button does not honor
 powerd.fl_min (#2396)

---
 frontend/ui/widget/frontlightwidget.lua | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/frontend/ui/widget/frontlightwidget.lua b/frontend/ui/widget/frontlightwidget.lua
index 19f7e21e0..56f54ae0d 100644
--- a/frontend/ui/widget/frontlightwidget.lua
+++ b/frontend/ui/widget/frontlightwidget.lua
@@ -25,9 +25,6 @@ local FrontLightWidget = InputContainer:new{
     title_face = Font:getFace("tfont", 22),
     width = nil,
     height = nil,
-    fl_cur = 0,
-    fl_min = 0,
-    fl_max = 10,
 }
 
 function FrontLightWidget:init()
@@ -38,9 +35,12 @@ function FrontLightWidget:init()
     self.span = math.ceil(self.screen_height * 0.01)
     self.width = self.screen_width * 0.95
     local powerd = Device:getPowerDevice()
-    self.fl_cur = powerd.fl_intensity
     self.fl_min = powerd.fl_min
     self.fl_max = powerd.fl_max
+    self.fl_cur = powerd.fl_intensity
+    if self.fl_cur == nil then
+        self.fl_cur = self.fl_min
+    end
     local steps_fl = self.fl_max - self.fl_min + 1
     self.one_step = math.ceil(steps_fl  / 25 )
     self.steps = math.ceil(steps_fl / self.one_step)
@@ -102,6 +102,7 @@ function FrontLightWidget:setProgress(num, step)
     local enable_button_plus = true
     local enable_button_minus = true
     local step_num = math.floor(num / step)
+    local step_min = math.floor(self.fl_min / step)
     if num then
         self.fl_cur = num
         set_fl = math.min(self.fl_cur, self.fl_max)
@@ -109,7 +110,7 @@ function FrontLightWidget:setProgress(num, step)
         if set_fl == self.fl_max then enable_button_plus = false end
         if set_fl == self.fl_min then enable_button_minus = false end
 
-        for i = 0, step_num do
+        for i = step_min, step_num do
             table.insert(fl_group, self.fl_prog_button:new{
                 text= "",
                 margin = 1,
@@ -122,7 +123,7 @@ function FrontLightWidget:setProgress(num, step)
         num = 0
     end
 
-    for i = step_num + 1, self.steps -1 do
+    for i = step_num + 1, step_min + self.steps -1 do
         table.insert(fl_group, self.fl_prog_button:new{
             callback = function() self:setProgress(i * step, step) end
         })