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

Naughty: Remove some code duplication 

2b69d333f8 added some code duplication here. I guess this was a
mis-rebase or something like that. Anyway, the width and height of the wibox is
already calculated right before this code snippet and the existing calculation
is even correct (now that the calculation for a wibox' geometry with
border_width was fixed up).

Tested via notify-send with and without icon.

Signed-off-by: Uli Schlachter <psychon@znc.in>
Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Uli Schlachter 2009-07-29 14:43:00 +02:00 committed by Julien Danjou
parent 1de7fdfe60
commit 51dc458fb9
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/naughty.lua.in
View File

@ -379,24 +379,10 @@ function notify(args)
notification.width = width + 2 * (border_width or 0)
-- position the wibox
if iconbox and iconbox.image.height > textbox:extents()["height"] then
notification.height = iconbox.image.height + (2 * config.border_width)
else
notification.height = textbox:extents()["height"] + (2 * config.border_width)
end
notification.width = (iconbox and iconbox:extents()["width"] or 0) + textbox:extents()["width"] + (2 * config.border_width)
if capi.screen[screen].workarea.width < notification.width then
notification.width = capi.screen[screen].workarea.width - (2 * config.border_width) - (2 * config.padding)
end
if capi.screen[screen].workarea.height < notification.height then
notification.height = capi.screen[screen].workarea.height - (2 * config.border_width) - (2 * config.padding)
end
local offset = get_offset(screen, notification.position, notification.idx, notification.width, notification.height)
local offset = get_offset(screen, notification.position, nil, notification.width, notification.height)
notification.box.ontop = ontop
notification.box:geometry({ width = notification.width,
height = notification.height,
notification.box:geometry({ width = width,
height = height,
x = offset.x,
y = offset.y })
notification.box.opacity = opacity