Skip to content

fix(awful.titlebar): honor the urgent state for titlebar buttons #4107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
keryell wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −14
Open

fix(awful.titlebar): honor the urgent state for titlebar buttons #4107

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 26 additions & 14 deletions lib/awful/titlebar.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -993,13 +993,18 @@ function titlebar.widget.button(c, name, selector, action)
img = "inactive"
end
end
local prefix = "normal"
if c.active then
prefix = "focus"
end
if img ~= "" then
prefix = prefix .. "_"
-- Ordered list of state prefixes to try, most specific first, so a
-- theme that ships no images for the urgent (or focus) state falls
-- back gracefully: urgent -> focus -> normal.
local prefixes
if c.urgent then
prefixes = { "urgent", "focus", "normal" }
elseif c.active then
prefixes = { "focus", "normal" }
else
prefixes = { "normal" }
end
local sep = img ~= "" and "_" or ""
local state = ret.state
if state ~= "" then
state = "_" .. state
Expand All @@ -1010,13 +1015,18 @@ function titlebar.widget.button(c, name, selector, action)
or default_tooltip_messages[name .. "_" .. img]
or default_tooltip_messages[name]
or name
-- First try with a prefix based on the client's focus state,
-- then try again without that prefix if nothing was found,
-- and finally, try a fallback for compatibility with Awesome 3.5 themes
local theme = beautiful["titlebar_" .. name .. "_button_" .. prefix .. img .. state]
or beautiful["titlebar_" .. name .. "_button_" .. prefix .. img]
or beautiful["titlebar_" .. name .. "_button_" .. img]
or beautiful["titlebar_" .. name .. "_button_" .. prefix .. "_inactive"]
-- First try with a prefix based on the client's state, falling back
-- to less specific states, then without a prefix, and finally a
-- fallback for compatibility with Awesome 3.5 themes.
local theme
for _, prefix in ipairs(prefixes) do
theme = beautiful["titlebar_" .. name .. "_button_" .. prefix .. sep .. img .. state]
or beautiful["titlebar_" .. name .. "_button_" .. prefix .. sep .. img]
if theme then break end
end
theme = theme
or beautiful["titlebar_" .. name .. "_button_" .. img]
or beautiful["titlebar_" .. name .. "_button_" .. prefixes[1] .. sep .. "_inactive"]
if theme then
img = theme
end
Expand Down Expand Up @@ -1063,9 +1073,11 @@ function titlebar.widget.button(c, name, selector, action)
update()

-- We do magic based on whether a client is focused above, so we need to
-- connect to the corresponding signal here.
-- connect to the corresponding signal here. The urgent state also selects
-- a distinct button image, so react to it too.
update_on_signal(c, "focus", ret)
update_on_signal(c, "unfocus", ret)
update_on_signal(c, "property::urgent", ret)

return ret
end
Expand Down