wibar: Add a remove function

This commit is contained in:
Emmanuel Lepage Vallee 2016-05-15 03:50:39 -04:00
parent dafd29f2a3
commit 38185b161a
1 changed files with 24 additions and 7 deletions

View File

@ -6,7 +6,7 @@
-- @author Emmanuel Lepage Vallee <elv1313@gmail.com> -- @author Emmanuel Lepage Vallee <elv1313@gmail.com>
-- @copyright 2016 Emmanuel Lepage Vallee -- @copyright 2016 Emmanuel Lepage Vallee
-- @release @AWESOME_VERSION@ -- @release @AWESOME_VERSION@
-- @module awful.wibar -- @classmod awful.wibar
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
-- Grab environment we need -- Grab environment we need
@ -165,6 +165,25 @@ local function set_stretch(w, value)
attach(w, w.position) attach(w, w.position)
end end
--- Remove a wibar.
-- @function remove
local function remove(self)
self.visible = false
if self.detach_callback then
self.detach_callback()
self.detach_callback = nil
end
for k, w in ipairs(wiboxes) do
if w == self then
table.remove(wiboxes, k)
end
end
self._screen = nil
end
--- Get a wibox position if it has been set, or return top. --- Get a wibox position if it has been set, or return top.
-- @param wb The wibox -- @param wb The wibox
-- @deprecated awful.wibar.get_position -- @deprecated awful.wibar.get_position
@ -291,6 +310,7 @@ function awfulwibar.new(arg)
local w = wibox(arg) local w = wibox(arg)
w.screen = screen w.screen = screen
w._screen = screen --HACK When a screen is removed, then getbycoords wont work
w._stretch = arg.stretch == nil and has_to_stretch or arg.stretch w._stretch = arg.stretch == nil and has_to_stretch or arg.stretch
w:add_signal("property::position") w:add_signal("property::position")
@ -300,6 +320,7 @@ function awfulwibar.new(arg)
w:add_signal("property::stretch") w:add_signal("property::stretch")
w.get_stretch = get_stretch w.get_stretch = get_stretch
w.set_stretch = set_stretch w.set_stretch = set_stretch
w.remove = remove
w.visible = true w.visible = true
@ -314,12 +335,8 @@ end
capi.screen.connect_signal("removed", function(s) capi.screen.connect_signal("removed", function(s)
for _, wibar in ipairs(wiboxes) do for _, wibar in ipairs(wiboxes) do
if wibar.screen == s then if wibar._screen == s then
if wibar.detach_callback then wibar:remove()
wibar.detach_callback()
end
wibar.visible = false
end end
end end
end) end)