Merge remote-tracking branch 'upstream/master'

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

diff --git a/widgets/borderbox.lua b/widgets/borderbox.lua
index 150c1c3ca28ab2676879d717ef6a0d2e6e5bdaaa..149b83517f29467125eddeaf82b0569b51836ac0 100644 (file)
--- a/widgets/borderbox.lua
+++ b/widgets/borderbox.lua
@@ -7,7 +7,7 @@
                                                   
 --]]
 
                                                   
 --]]
 

-local wibox        = require("awful.wibox")
+local wibox = require("awful.wibox")

 local setmetatable = setmetatable
 
 -- Creates a thin wibox at a position relative to another wibox
 local setmetatable = setmetatable
 
 -- Creates a thin wibox at a position relative to another wibox


@@ -15,23 +15,20 @@ local setmetatable = setmetatable
 local borderbox = {}
 
 local function worker(relbox, s, args)
 local borderbox = {}
 
 local function worker(relbox, s, args)

-    local where = args.position or 'above'
-    local color = args.color or '#FFFFFF'
-    local size = args.size or 1
-    local box = nil
-    local wiboxarg = {
-        position = nil,
-        bg = color
-    }
+    local where    = args.position or 'top'
+    local color    = args.color or '#FFFFFF'
+    local size     = args.size or 1
+    local box      = nil
+    local wiboxarg = { position = nil, bg = color }

 
 

-    if where == 'above'
+    if where == 'top'

     then
         wiboxarg.width = relbox.width
         wiboxarg.height = size
         box = wibox(wiboxarg)
         box.x = relbox.x
         box.y = relbox.y - size
     then
         wiboxarg.width = relbox.width
         wiboxarg.height = size
         box = wibox(wiboxarg)
         box.x = relbox.x
         box.y = relbox.y - size

-    elseif where == 'below'
+    elseif where == 'bottom'

     then
         wiboxarg.width = relbox.width
         wiboxarg.height = size
     then
         wiboxarg.width = relbox.width
         wiboxarg.height = size