Commit f3543c116332adbf7fbbe2bf43f3b5d64f16e057 - awesome-extra

Update freedesktop Reiner Herrmann 3 years ago

2 changed file(s) with 22 addition(s) and 17 deletion(s). Raw diff Collapse all Expand all

-3

freedesktop/desktop.lua less more

15	15	local utils = require("menubar.utils")
16	16	local wibox = require("wibox")
17	17
18		local capi = capi
19	18	local io = io
20	19	local ipairs = ipairs
21	20	local mouse = mouse
22	21	local os = os
23	22	local string = string
	23	local screen = screen
24	24	local table = table
25	25
26	26	-- Desktop icons

76	76
77	77	-- define icon dimensions and position
78	78	if not desktop_current_pos[s] then
79		desktop_current_pos[s] = { x = (capi.screen[s].geometry.x + args.iconsize.width + args.margin.x), y = 40 }
	79	desktop_current_pos[s] = { x = (screen[s].geometry.x + args.iconsize.width + args.margin.x), y = 40 }
80	80	end
81	81
82	82	local totheight = (icon and args.iconsize.height or 0) + (label and args.labelsize.height or 0)
83	83	if totheight == 0 then return end
84	84
85		if desktop_current_pos[s].y + totheight > capi.screen[s].geometry.height - 40 then
	85	if desktop_current_pos[s].y + totheight > screen[s].geometry.height - 40 then
86	86	desktop_current_pos[s].x = desktop_current_pos[s].x + args.labelsize.width + args.iconsize.width + args.margin.x
87	87	desktop_current_pos[s].y = 40
88	88	end

+19

-14

freedesktop/menu.lua less more

14	14	local menu_gen = require("menubar.menu_gen")
15	15	local menu_utils = require("menubar.utils")
16	16	local icon_theme = require("menubar.icon_theme")
17		local gls = require("gears.filesystem")
18	17
19		local pairs, string, table, os = pairs, string, table, os
20
21		-- Add support for NixOS systems too
22		table.insert(menu_gen.all_menu_dirs, string.format("%s/.nix-profile/share/applications", os.getenv("HOME")))
23
24		-- Remove non existent paths in order to avoid issues
25		local existent_paths = {}
26		for k,v in pairs(menu_gen.all_menu_dirs) do
27		if gls.is_dir(v) then
28		table.insert(existent_paths, v)
29		end
30		end
31		menu_gen.all_menu_dirs = existent_paths
	18	local io, pairs, string, table, os = io, pairs, string, table, os
32	19
33	20	-- Expecting a wm_name of awesome omits too many applications and tools
34	21	menu_utils.wm_name = ""

36	23	-- Menu
37	24	-- freedesktop.menu
38	25	local menu = {}
	26
	27	-- Determines if a path points to a directory, by checking if it can be read
	28	-- (which is `nil` also for empty files) and if its size is not 0.
	29	-- @author blueyed
	30	-- @param path the path to check
	31	function menu.is_dir(path)
	32	local f = io.open(path)
	33	return f and not f:read(0) and f:seek("end") ~= 0 and f:close()
	34	end
	35
	36	-- Remove non existent paths in order to avoid issues
	37	local existent_paths = {}
	38	for k,v in pairs(menu_gen.all_menu_dirs) do
	39	if menu.is_dir(v) then
	40	table.insert(existent_paths, v)
	41	end
	42	end
	43	menu_gen.all_menu_dirs = existent_paths
39	44
40	45	-- Determines whether an table includes a certain element
41	46	-- @param tab a given table