apply #439 to alsabar as well

[etc/awesome.git] / widget / fs.lua

diff --git a/widget/fs.lua b/widget/fs.lua
index 425b51cd5d3d830724b1a1a82b9e898bd426ca09..58fbf93ffbc574bcfebe8a7910a89c5e6fc7b1c1 100644 (file)
--- a/widget/fs.lua
+++ b/widget/fs.lua
@@ -69,7 +69,7 @@ local function factory(args)
     end
 
     function fs.update()
     end
 
     function fs.update()

-        local notifytable = { [1] = string.format("%-10s %-5s %s\t%s\t\n", "path", "used", "free", "size") }
+        local notifytable = { [1] = string.format("%-10s %4s\t%6s\t%6s\t\n", "path", "used", "free", "size") }

         local pathlen = 10
         local maxpathidx = 1
         fs_now = {}
         local pathlen = 10
         local maxpathidx = 1
         fs_now = {}


@@ -96,8 +96,8 @@ local function factory(args)
                     }
 
                     if fs_now[path].percentage > 0 then -- don't notify unused file systems
                     }
 
                     if fs_now[path].percentage > 0 then -- don't notify unused file systems

-                        notifytable[#notifytable+1] = string.format("\n%-10s %-3s\t%.2f\t%.2f\t%s", path,
-                        math.floor(fs_now[path].percentage) .. "%", fs_now[path].free, fs_now[path].size,
+                        notifytable[#notifytable+1] = string.format("\n%-10s %3s%%\t%6.2f\t%6.2f\t%s", path,
+                        math.floor(fs_now[path].percentage), fs_now[path].free, fs_now[path].size,

                         fs_now[path].units)
 
                         if #path > pathlen then
                         fs_now[path].units)
 
                         if #path > pathlen then


@@ -125,7 +125,7 @@ local function factory(args)
             end
         end
 
             end
         end
 

-        if pathlen > 10 then -- formatting aesthetics
+        if pathlen > 10 then -- if are there paths longer than 10 chars, reformat first column accordingly

             local pathspaces
             for i = 1, #notifytable do
                 pathspaces = notifytable[i]:match("[ ]+")
             local pathspaces
             for i = 1, #notifytable do
                 pathspaces = notifytable[i]:match("[ ]+")