Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #683 from actionless/fix-hotkeys-sorting 

fix(awful: hotkeys): fix sorting of hotkeys
This commit is contained in:
Emmanuel Lepage Vallée 2016-02-11 03:44:16 -05:00
parent d59bdec32f 4aaedb0f86
commit dd7b7bf48f
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
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
@ -250,7 +245,7 @@ local function create_wibox(s, available_groups)
table.insert(((i<available_height_items) and new_keys or overlap_leftovers), keys[i]) table.insert(((i<available_height_items) and new_keys or overlap_leftovers), keys[i])
end end
keys = new_keys keys = new_keys
table.insert(keys, {hotkey=markup.fg(widget.modifiers_color, "▽"), description=""}) table.insert(keys, {key=markup.fg(widget.modifiers_color, "▽"), description=""})
end end
if not current_column then if not current_column then
current_column = {layout=wibox.layout.fixed.vertical()} current_column = {layout=wibox.layout.fixed.vertical()}
@ -262,10 +257,19 @@ 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 length = string.len(key.key or '') + string.len(key.description or '')
local length = string.len(hotkey) + string.len(key.description) local modifiers = key.mod
local rendered_hotkey = markup.font(widget.title_font, hotkey.." ") .. if not modifiers or modifiers == "none" then
(markup.font(widget.description_font, key.description) or "") modifiers = ""
else
length = length + string.len(modifiers) + 1 -- +1 for "+" character
modifiers = markup.fg(widget.modifiers_color, modifiers.."+")
end
local rendered_hotkey = markup.font(widget.title_font,
modifiers .. (key.key or "") .. " "
) .. markup.font(widget.description_font,
key.description or ""
)
if length > max_label_width then if length > max_label_width then
max_label_width = length max_label_width = length
max_label_content = rendered_hotkey max_label_content = rendered_hotkey