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

awful.menu: add support for widget layouts 

Signed-off-by: Gregor Best <farhaven@googlemail.com>
Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Gregor Best 2009-03-10 20:31:41 +01:00 committed by Julien Danjou
parent 2b69d333f8
commit ea618d3688
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/awful/menu.lua.in
View File

@ -23,6 +23,7 @@ local capi =
} }
local util = require("awful.util") local util = require("awful.util")
local tags = require("awful.tag") local tags = require("awful.tag")
local layout = require("awful.widget.layout")
local awbeautiful = require("beautiful") local awbeautiful = require("beautiful")
local awibox = require("awful.wibox") local awibox = require("awful.wibox")
local tonumber = tonumber local tonumber = tonumber
@ -181,7 +182,7 @@ local function add_item(data, num, item_info)
) )
-- Create the item label widget -- Create the item label widget
local label = widget({ type = "textbox", align = "left" }) local label = widget({ type = "textbox" })
label.text = item_info[1] label.text = item_info[1]
label:margin({ left = data.h + 2 }) label:margin({ left = data.h + 2 })
-- Set icon if needed -- Set icon if needed
@ -207,7 +208,7 @@ local function add_item(data, num, item_info)
-- Create the submenu icon widget -- Create the submenu icon widget
local submenu local submenu
if type(item_info[2]) == "table" then if type(item_info[2]) == "table" then
submenu = widget({ type = "imagebox", align = "right" }) submenu = widget({ type = "imagebox" })
submenu.image = data.theme.submenu_icon and image(data.theme.submenu_icon) submenu.image = data.theme.submenu_icon and image(data.theme.submenu_icon)
submenu:buttons(bindings) submenu:buttons(bindings)
@ -215,7 +216,11 @@ local function add_item(data, num, item_info)
end end
-- Add widgets to the wibox -- Add widgets to the wibox
item.widgets = { label, submenu } item.widgets = {
label,
submenu,
layout = layout.horizontal.flex
}
item.ontop = true item.ontop = true
@ -255,7 +260,7 @@ local function set_coords(menu, screen_idx)
local screen_w = s_geometry.x + s_geometry.width local screen_w = s_geometry.x + s_geometry.width
local screen_h = s_geometry.y + s_geometry.height local screen_h = s_geometry.y + s_geometry.height
local i_h = menu.h - menu.theme.border_width local i_h = menu.h + menu.theme.border_width
local m_h = (i_h * #menu.items) + menu.theme.border_width local m_h = (i_h * #menu.items) + menu.theme.border_width
if menu.parent then if menu.parent then
@ -291,7 +296,7 @@ function show(menu, keygrabber)
width = menu.w, width = menu.w,
height = menu.h, height = menu.h,
x = menu.x, x = menu.x,
y = menu.y + (num - 1) * (menu.h - menu.theme.border_width) y = menu.y + (num - 1) * (menu.h + menu.theme.border_width)
}) })
wibox.screen = screen_index wibox.screen = screen_index
end end