widget.calendar reimplemented and renamed to widget.cal; util.quake: simpler geometri...

[etc/awesome.git] / util / separators.lua

diff --git a/util/separators.lua b/util/separators.lua
index 6e5ef96f9be785b53e470090fc438b1f0cff5f2e..29d3005fa46f6feb2fb0ee2a2f58c8f916533e9b 100644 (file)
--- a/util/separators.lua
+++ b/util/separators.lua
@@ -1,22 +1,17 @@
-

 --[[
 --[[

-                                                   
-     Licensed under GNU General Public License v2  
-      * (c) 2015, Luke Bonham                      
-      * (c) 2015, plotnikovanton                   
-                                                   
+
+     Licensed under GNU General Public License v2
+      * (c) 2015, Luca CPZ
+      * (c) 2015, plotnikovanton
+

 --]]
 
 local wibox     = require("wibox")
 --]]
 
 local wibox     = require("wibox")

-local beautiful = require("beautiful")

 local gears     = require("gears")
 
 -- Lain Cairo separators util submodule
 -- lain.util.separators
 local gears     = require("gears")
 
 -- Lain Cairo separators util submodule
 -- lain.util.separators

-local separators = {}
-
-local height = beautiful.awful_widget_height or 0
-local width  = beautiful.separators_width or 9
+local separators = { height = 0, width = 9 }

 
 -- [[ Arrow
 
 
 -- [[ Arrow
 


@@ -24,7 +19,9 @@ local width  = beautiful.separators_width or 9
 function separators.arrow_right(col1, col2)
     local widget = wibox.widget.base.make_widget()
 
 function separators.arrow_right(col1, col2)
     local widget = wibox.widget.base.make_widget()
 

-    widget.fit = function(m, w, h) return width, height end
+    widget.fit = function(m, w, h)
+        return separators.width, separators.height
+    end

 
     widget.draw = function(mycross, wibox, cr, width, height)
         if col2 ~= "alpha" then
 
     widget.draw = function(mycross, wibox, cr, width, height)
         if col2 ~= "alpha" then


@@ -62,7 +59,9 @@ end
 function separators.arrow_left(col1, col2)
     local widget = wibox.widget.base.make_widget()
 
 function separators.arrow_left(col1, col2)
     local widget = wibox.widget.base.make_widget()
 

-    widget.fit = function(m, w, h) return width, height end
+    widget.fit = function(m, w, h)
+        return separators.width, separators.height
+    end

 
     widget.draw = function(mycross, wibox, cr, width, height)
         if col1 ~= "alpha" then
 
     widget.draw = function(mycross, wibox, cr, width, height)
         if col1 ~= "alpha" then