]> git.madduck.net Git - etc/awesome.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / etc / awesome.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5e6bcf3)
#222 #223: readd math.min to catch #158
authorcopycat-killer <dada@archlinux.info>
Tue, 16 Aug 2016 10:31:50 +0000 (12:31 +0200)
committercopycat-killer <dada@archlinux.info>
Tue, 16 Aug 2016 10:31:50 +0000 (12:31 +0200)
widgets/bat.lua patch | blob | history
wiki patch | blob | history

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 00d718375b9356eb09072a2e29ac3dbe79cf135d..43bb57fc52e72b57ab385b32736ed042e4d84ee1 100644 (file)
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -131,7 +131,7 @@ local function worker(args)
 
                 local hours     = math.floor(rate_time)
                 local minutes   = math.floor((rate_time - hours) * 60)
-                bat_now.perc    = math.floor((sum_energy_now / sum_energy_full) * 100)
+                bat_now.perc    = math.floor(math.min(100, (sum_energy_now / sum_energy_full) * 100))
                 bat_now.time    = string.format("%02d:%02d", hours, minutes)
                 bat_now.watt    = tonumber(string.format("%.2f", sum_rate_energy / 1e6))
             elseif bat_now.status == "Full" then
diff --git a/wiki b/wiki
index 8d62fdf794fe0d26802a7d0f7cf156e6b5b620f1..427a9d6acbf3b67ce7d61bb2313ff7a983a658b3 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 8d62fdf794fe0d26802a7d0f7cf156e6b5b620f1
+Subproject commit 427a9d6acbf3b67ce7d61bb2313ff7a983a658b3
awesome window-manager configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.