modified: widgets/weather.lua - seems fixed datetime calculation

[etc/awesome.git] / widgets / bat.lua

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 152fa12a626a6ed70eb7f17d6e8521209be436e6..43b7a5f22102fd0cc54bd0ce2bde021586fc415b 100644 (file)
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -13,7 +13,7 @@ local first_line   = require("lain.helpers").first_line
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 

-local math         = { floor  = math.floor }
+local math         = { floor  = math.floor, min = math.min }

 local string       = { format = string.format }
 local tonumber     = tonumber
 
 local string       = { format = string.format }
 local tonumber     = tonumber
 


@@ -98,7 +98,7 @@ local function worker(args)
                 local minutes = math.floor((rate_time - hours) * 60)
                 local watt    = rate_power and (rate_power / 1e6) or (rate_voltage * rate_current) / 1e12
 
                 local minutes = math.floor((rate_time - hours) * 60)
                 local watt    = rate_power and (rate_power / 1e6) or (rate_voltage * rate_current) / 1e12
 

-                bat_now.perc = string.format("%d", energy_percentage)
+                bat_now.perc = string.format("%d", math.min(100, energy_percentage))

                 bat_now.time = string.format("%02d:%02d", hours, minutes)
                 bat_now.watt = string.format("%.2fW", watt)
             end
                 bat_now.time = string.format("%02d:%02d", hours, minutes)
                 bat_now.watt = string.format("%.2fW", watt)
             end