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

Fix menubar screen handling 

Running test-menubar.lua just failed for me locally. The reason was that
the textbox was indexing a nil value when doing 's.dpi'.

This commit fixes the menubar so that its optional screen arguments are
really handled correctly. In fact, a default screen is now chosen way
earlier than before, so that no nil values are used as screens later on.

In other news: I guess test-menubar.lua is not run on any of our Travis
targets...

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2017-10-08 14:53:58 +02:00
parent a137655791
commit 74a6cbedce
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/menubar/init.lua
View File

@ -340,6 +340,7 @@ end
--- Refresh menubar's cache by reloading .desktop files. --- Refresh menubar's cache by reloading .desktop files.
-- @tparam[opt] screen scr Screen. -- @tparam[opt] screen scr Screen.
function menubar.refresh(scr) function menubar.refresh(scr)
scr = get_screen(scr or awful.screen.focused() or 1)
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
@ -393,8 +394,9 @@ local function prompt_keypressed_callback(mod, key, comm)
end end
--- Show the menubar on the given screen. --- Show the menubar on the given screen.
-- @param scr Screen. -- @param[opt] scr Screen.
function menubar.show(scr) function menubar.show(scr)
scr = get_screen(scr or awful.screen.focused() or 1)
if not instance then if not instance then
-- Add to each category the name of its key in all_categories -- Add to each category the name of its key in all_categories
for k, v in pairs(menubar.menu_gen.all_categories) do for k, v in pairs(menubar.menu_gen.all_categories) do
@ -425,8 +427,6 @@ function menubar.show(scr)
end end
-- Set position and size -- Set position and size
scr = scr or awful.screen.focused() or 1
scr = get_screen(scr)
local scrgeom = scr.workarea local scrgeom = scr.workarea
local geometry = menubar.geometry local geometry = menubar.geometry
instance.geometry = {x = geometry.x or scrgeom.x, instance.geometry = {x = geometry.x or scrgeom.x,