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

fix(menubar): use current query after refreshing entries list 

closes #1421
This commit is contained in:
actionless 2017-02-05 22:06:29 +01:00
parent 6416045baa
commit 4c3b63009c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/menubar/init.lua
View File

@ -351,7 +351,7 @@ function menubar.refresh(scr)
menubar.menu_gen.generate(function(entries) menubar.menu_gen.generate(function(entries)
menubar.menu_entries = entries menubar.menu_entries = entries
if instance then if instance then
menulist_update(nil, scr) menulist_update(instance.query, scr)
end end
end) end)
end end
@ -408,6 +408,7 @@ function menubar.show(scr)
wibox = wibox({ ontop = true }), wibox = wibox({ ontop = true }),
widget = menubar.get(scr), widget = menubar.get(scr),
prompt = awful.widget.prompt(), prompt = awful.widget.prompt(),
query = nil,
} }
local layout = wibox.layout.fixed.horizontal() local layout = wibox.layout.fixed.horizontal()
layout:add(instance.prompt) layout:add(instance.prompt)
@ -434,7 +435,7 @@ function menubar.show(scr)
current_item = 1 current_item = 1
current_category = nil current_category = nil
menulist_update(nil, scr) menulist_update(instance.query, scr)
local prompt_args = menubar.prompt_args or {} local prompt_args = menubar.prompt_args or {}
@ -444,7 +445,10 @@ function menubar.show(scr)
completion_callback = awful.completion.shell, completion_callback = awful.completion.shell,
history_path = awful.util.get_cache_dir() .. "/history_menu", history_path = awful.util.get_cache_dir() .. "/history_menu",
done_callback = menubar.hide, done_callback = menubar.hide,
changed_callback = function(query) menulist_update(query, scr) end, changed_callback = function(query)
instance.query = query
menulist_update(query, scr)
end,
keypressed_callback = prompt_keypressed_callback keypressed_callback = prompt_keypressed_callback
}, {__index=prompt_args})) }, {__index=prompt_args}))