Added backlight popup
This commit is contained in:
@ -1,5 +1,4 @@
|
||||
local volume = require("modules.volume.util")
|
||||
local widget = require("modules.volume.widget")
|
||||
local popup = require("modules.volume.popup")
|
||||
|
||||
return {
|
||||
|
@ -4,7 +4,7 @@ return gears.table.join(
|
||||
awful.key( {}, "XF86AudioRaiseVolume",
|
||||
function ()
|
||||
volume.volume_up(config.volume.button_step)
|
||||
awesome.emit_signal("module::volume_popup:show")
|
||||
awesome.emit_signal("module::volume:popup_show")
|
||||
end,
|
||||
{
|
||||
description = "Volume up",
|
||||
@ -15,7 +15,7 @@ return gears.table.join(
|
||||
awful.key( {}, "XF86AudioLowerVolume",
|
||||
function ()
|
||||
volume.volume_down(config.volume.button_step)
|
||||
awesome.emit_signal("module::volume_popup:show")
|
||||
awesome.emit_signal("module::volume:popup_show")
|
||||
end,
|
||||
{
|
||||
description = "Volume down",
|
||||
@ -26,7 +26,7 @@ return gears.table.join(
|
||||
awful.key( {}, "XF86AudioMute",
|
||||
function ()
|
||||
volume.toggle_mute()
|
||||
awesome.emit_signal("module::volume_popup:show")
|
||||
awesome.emit_signal("module::volume:popup_show")
|
||||
end,
|
||||
{
|
||||
description = "Mute",
|
||||
|
@ -125,6 +125,26 @@ return function(s)
|
||||
layout = wibox.layout.fixed.horizontal
|
||||
}
|
||||
|
||||
local hide_popup_timer = gears.timer {
|
||||
timeout = 1,
|
||||
autostart = true,
|
||||
callback = function()
|
||||
popup_container.visible = false
|
||||
end
|
||||
}
|
||||
|
||||
|
||||
awesome.connect_signal("module::all:popup_hide",
|
||||
function(except)
|
||||
if (except == "volume") then
|
||||
return
|
||||
end
|
||||
popup_container.visible = false
|
||||
if hide_popup_timer.started then
|
||||
hide_popup_timer:stop()
|
||||
end
|
||||
end
|
||||
)
|
||||
|
||||
awesome.connect_signal("module::volume:update",
|
||||
function(status)
|
||||
@ -169,17 +189,9 @@ return function(s)
|
||||
end
|
||||
)
|
||||
|
||||
local hide_popup_timer = gears.timer {
|
||||
timeout = 1,
|
||||
autostart = true,
|
||||
callback = function()
|
||||
popup_container.visible = false
|
||||
end
|
||||
}
|
||||
|
||||
|
||||
awesome.connect_signal("module::volume_popup:show",
|
||||
awesome.connect_signal("module::volume:popup_show",
|
||||
function()
|
||||
awesome.emit_signal("module::all:popup_hide", "volume")
|
||||
if s == mouse.screen then
|
||||
popup_container.visible = true
|
||||
end
|
||||
@ -192,8 +204,9 @@ return function(s)
|
||||
end
|
||||
)
|
||||
|
||||
awesome.connect_signal("module::volume_popup:show_stay",
|
||||
awesome.connect_signal("module::volume:popup_show_stay",
|
||||
function()
|
||||
awesome.emit_signal("module::all:popup_hide", "volume")
|
||||
if s == mouse.screen then
|
||||
popup_container.visible = true
|
||||
end
|
||||
@ -207,7 +220,7 @@ return function(s)
|
||||
|
||||
popup_container:connect_signal("button::press",
|
||||
function(_, _, _, button, mods)
|
||||
-- Right-click
|
||||
-- Left-click
|
||||
if (button == 1) then
|
||||
volume.toggle_mute()
|
||||
|
||||
@ -223,11 +236,11 @@ return function(s)
|
||||
)
|
||||
|
||||
popup_container:connect_signal("mouse::enter", function(result)
|
||||
awesome.emit_signal("module::volume_popup:show_stay")
|
||||
awesome.emit_signal("module::volume:popup_show_stay")
|
||||
end)
|
||||
|
||||
popup_container:connect_signal("mouse::leave", function(result)
|
||||
awesome.emit_signal("module::volume_popup:show")
|
||||
awesome.emit_signal("module::volume:popup_show")
|
||||
end)
|
||||
|
||||
end
|
||||
|
@ -70,19 +70,19 @@ widget.widget = wibox.widget {
|
||||
|
||||
widget.widget:connect_signal("mouse::enter", function(result)
|
||||
widget.widget.bg = beautiful.color.bar.hover_bg
|
||||
awesome.emit_signal("module::volume_popup:show_stay")
|
||||
awesome.emit_signal("module::volume:popup_show_stay")
|
||||
end)
|
||||
|
||||
widget.widget:connect_signal("mouse::leave", function(result)
|
||||
widget.widget.bg = beautiful.color.transparent
|
||||
awesome.emit_signal("module::volume_popup:show")
|
||||
awesome.emit_signal("module::volume:popup_show")
|
||||
end)
|
||||
|
||||
widget.widget:connect_signal("button::press",
|
||||
function(_, _, _, button, mods)
|
||||
|
||||
-- Right-click
|
||||
if (button == 3) then
|
||||
-- Left-click
|
||||
if (button == 1) then
|
||||
volume.toggle_mute()
|
||||
|
||||
-- Scroll up
|
||||
@ -93,7 +93,7 @@ widget.widget:connect_signal("button::press",
|
||||
elseif (button == 5) then
|
||||
volume.volume_down(config.volume.scroll_step)
|
||||
end
|
||||
awesome.emit_signal("module::volume_popup:update")
|
||||
awesome.emit_signal("module::volume:popup_update")
|
||||
end
|
||||
)
|
||||
|
||||
|
Reference in New Issue
Block a user