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

menubar: Make some parameters configurable again 

After the rewrite from modules they ended up being local, but should
be available to user externally.
Also remove unnecessary local context bindings.

Signed-off-by: Alexander Yakushev <yakushev.alex@gmail.com>
Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Alexander Yakushev 2012-09-04 02:48:03 +03:00 committed by Uli Schlachter
parent d60488f73e
commit 8150482a53
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/menubar/init.lua.in
View File

@ -15,15 +15,6 @@ local common = require("awful.widget.common")
local theme = require("beautiful") local theme = require("beautiful")
local wibox = require("wibox") local wibox = require("wibox")
-- Standard lua
local pairs = pairs
local ipairs = ipairs
local table = table
local tonumber = tonumber
local string = string
local math = math
local setmetatable = setmetatable
-- menubar -- menubar
local menubar = { mt = {} } local menubar = { mt = {} }
menubar.menu_gen = require("menubar.menu_gen") menubar.menu_gen = require("menubar.menu_gen")
@ -50,19 +41,19 @@ menubar.utils = require("menubar.utils")
-- When true the .desktop files will be reparsed only when the -- When true the .desktop files will be reparsed only when the
-- extension is initialized. Use this if menubar takes much time to -- extension is initialized. Use this if menubar takes much time to
-- open. -- open.
local cache_entries = true menubar.cache_entries = true
-- When true the categories will be shown alongside application -- When true the categories will be shown alongside application
-- entries. -- entries.
local show_categories = true menubar.show_categories = true
-- Specifies the geometry of the menubar. This is a table with the keys -- Specifies the geometry of the menubar. This is a table with the keys
-- x, y, width and height. Missing values are replaced via the screen's -- x, y, width and height. Missing values are replaced via the screen's
-- geometry. However, missing height is replaced by the font size. -- geometry. However, missing height is replaced by the font size.
local geometry = { width = nil, menubar.geometry = { width = nil,
height = nil, height = nil,
x = nil, x = nil,
y = nil } y = nil }
-- Private section -- Private section
local current_item = 1 local current_item = 1
@ -137,7 +128,7 @@ local function menulist_update(query)
-- command in the middle to the table match_inside. -- command in the middle to the table match_inside.
-- Add the categories -- Add the categories
if show_categories then if menubar.show_categories then
for _, v in pairs(menubar.menu_gen.all_categories) do for _, v in pairs(menubar.menu_gen.all_categories) do
v.focused = false v.focused = false
if not current_category and v.use then if not current_category and v.use then
@ -258,13 +249,14 @@ function menubar.show(scr)
initialize() initialize()
elseif instance.wibox.visible then -- Menu already shown, exit elseif instance.wibox.visible then -- Menu already shown, exit
return return
elseif not cache_entries then elseif not menubar.cache_entries then
menubar.refresh() menubar.refresh()
end end
-- Set position and size -- Set position and size
scr = scr or capi.mouse.screen or 1 scr = scr or capi.mouse.screen or 1
local scrgeom = capi.screen[scr].workarea local scrgeom = capi.screen[scr].workarea
local geometry = menubar.geometry
instance.wibox:geometry({x = geometry.x or scrgeom.x, instance.wibox:geometry({x = geometry.x or scrgeom.x,
y = geometry.y or scrgeom.y, y = geometry.y or scrgeom.y,
height = geometry.height or theme.get_font_height() * 1.5, height = geometry.height or theme.get_font_height() * 1.5,