Merge commit '33c0e0c2360a04fcc6f51bccb0ad2a7a9e9c07b3'

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

diff --git a/.config/awesome/lain/util/separators.lua b/.config/awesome/lain/util/separators.lua
index abf57c4b9c0e75892127147dc2df135e5e7761f7..465132d56193d6de9d7098c6ec66f8a948b2c040 100644 (file)
--- a/.config/awesome/lain/util/separators.lua
+++ b/.config/awesome/lain/util/separators.lua
@@ -1,14 +1,13 @@
-

 --[[
 --[[

-                                                   
-     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 gears     = require("gears")
+local wibox = require("wibox")
+local gears = require("gears")

 
 -- Lain Cairo separators util submodule
 -- lain.util.separators
 
 -- Lain Cairo separators util submodule
 -- lain.util.separators


@@ -19,14 +18,22 @@ local separators = { height = 0, width = 9 }
 -- Right
 function separators.arrow_right(col1, col2)
     local widget = wibox.widget.base.make_widget()
 -- Right
 function separators.arrow_right(col1, col2)
     local widget = wibox.widget.base.make_widget()

+    widget.col1 = col1
+    widget.col2 = col2

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

+    widget.update = function(col1, col2)
+        widget.col1 = col1
+        widget.col2 = col2
+        widget:emit_signal("widget::redraw_needed")
+    end
+

     widget.draw = function(mycross, wibox, cr, width, height)
     widget.draw = function(mycross, wibox, cr, width, height)

-        if col2 ~= "alpha" then
-            cr:set_source_rgb(gears.color.parse_color(col2))
+        if widget.col2 ~= "alpha" then
+            cr:set_source_rgb(gears.color.parse_color(widget.col2))

             cr:new_path()
             cr:move_to(0, 0)
             cr:line_to(width, height/2)
             cr:new_path()
             cr:move_to(0, 0)
             cr:line_to(width, height/2)


@@ -42,8 +49,8 @@ function separators.arrow_right(col1, col2)
             cr:fill()
         end
 
             cr:fill()
         end
 

-        if col1 ~= "alpha" then
-            cr:set_source_rgb(gears.color.parse_color(col1))
+        if widget.col1 ~= "alpha" then
+            cr:set_source_rgb(gears.color.parse_color(widget.col1))

             cr:new_path()
             cr:move_to(0, 0)
             cr:line_to(width, height/2)
             cr:new_path()
             cr:move_to(0, 0)
             cr:line_to(width, height/2)


@@ -59,14 +66,22 @@ end
 -- Left
 function separators.arrow_left(col1, col2)
     local widget = wibox.widget.base.make_widget()
 -- Left
 function separators.arrow_left(col1, col2)
     local widget = wibox.widget.base.make_widget()

+    widget.col1 = col1
+    widget.col2 = col2

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

+    widget.update = function(col1, col2)
+        widget.col1 = col1
+        widget.col2 = col2
+        widget:emit_signal("widget::redraw_needed")
+    end
+

     widget.draw = function(mycross, wibox, cr, width, height)
     widget.draw = function(mycross, wibox, cr, width, height)

-        if col1 ~= "alpha" then
-            cr:set_source_rgb(gears.color.parse_color(col1))
+        if widget.col1 ~= "alpha" then
+            cr:set_source_rgb(gears.color.parse_color(widget.col1))

             cr:new_path()
             cr:move_to(width, 0)
             cr:line_to(0, height/2)
             cr:new_path()
             cr:move_to(width, 0)
             cr:line_to(0, height/2)


@@ -82,14 +97,14 @@ function separators.arrow_left(col1, col2)
             cr:fill()
         end
 
             cr:fill()
         end
 

-        if col2 ~= "alpha" then
+        if widget.col2 ~= "alpha" then

             cr:new_path()
             cr:move_to(width, 0)
             cr:line_to(0, height/2)
             cr:line_to(width, height)
             cr:close_path()
 
             cr:new_path()
             cr:move_to(width, 0)
             cr:line_to(0, height/2)
             cr:line_to(width, height)
             cr:close_path()
 

-            cr:set_source_rgb(gears.color.parse_color(col2))
+            cr:set_source_rgb(gears.color.parse_color(widget.col2))

             cr:fill()
         end
    end
             cr:fill()
         end
    end