awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(awful: hotkeys): fix sorting of hotkeys

This commit is contained in:
actionless 2016-02-11 00:54:47 +01:00
parent ff8f2aef27
commit 64bd09d38d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/awful/hotkeys_popup/widget.lua
View File

@ -129,11 +129,6 @@ local function add_hotkey(key, data, target)
table.insert(readable_mods, widget.labels[mod] or mod) table.insert(readable_mods, widget.labels[mod] or mod)
end end
local joined_mods = join_plus_sort(readable_mods) local joined_mods = join_plus_sort(readable_mods)
if joined_mods == "none" then
joined_mods = ""
else
joined_mods = markup.fg(widget.modifiers_color, joined_mods.."+")
end
local group = data.group or "none" local group = data.group or "none"
group_list[group] = true group_list[group] = true
@ -262,7 +257,13 @@ local function create_wibox(s, available_groups)
local max_label_content = "" local max_label_content = ""
local joined_labels = "" local joined_labels = ""
for i, key in ipairs(_keys) do for i, key in ipairs(_keys) do
local hotkey = (key.mod or '')..(key.key or '') local modifiers = key.mod
if not modifiers or modifiers == "none" then
modifiers = ""
else
modifiers = markup.fg(widget.modifiers_color, modifiers.."+")
end
local hotkey = modifiers .. (key.key or '')
local length = string.len(hotkey) + string.len(key.description) local length = string.len(hotkey) + string.len(key.description)
local rendered_hotkey = markup.font(widget.title_font, hotkey.." ") .. local rendered_hotkey = markup.font(widget.title_font, hotkey.." ") ..
(markup.font(widget.description_font, key.description) or "") (markup.font(widget.description_font, key.description) or "")