Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

placement: Add some missing `ignore_border_width` checks. 

It was done in some places, but not all.
This commit is contained in:
Emmanuel Lepage Vallee 2017-01-26 03:04:14 -05:00
parent 3a0f139b9e
commit 4ea6e133f8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/awful/placement.lua
View File

@ -930,7 +930,7 @@ function placement.under_mouse(d, args)
ngeo.x = math.floor(m_coords.x - ngeo.width / 2) ngeo.x = math.floor(m_coords.x - ngeo.width / 2)
ngeo.y = math.floor(m_coords.y - ngeo.height / 2) ngeo.y = math.floor(m_coords.y - ngeo.height / 2)
local bw = d.border_width or 0 local bw = (not args.ignore_border_width) and d.border_width or 0
ngeo.width = ngeo.width - 2*bw ngeo.width = ngeo.width - 2*bw
ngeo.height = ngeo.height - 2*bw ngeo.height = ngeo.height - 2*bw
@ -1034,7 +1034,7 @@ function placement.resize_to_mouse(d, args)
pts.x_only and ngeo.y + ngeo.height or math.max(p2.y, p1.y) pts.x_only and ngeo.y + ngeo.height or math.max(p2.y, p1.y)
) )
local bw = d.border_width or 0 local bw = (not args.ignore_border_width) and d.border_width or 0
for _, a in ipairs {"width", "height"} do for _, a in ipairs {"width", "height"} do
ngeo[a] = ngeo[a] - 2*bw ngeo[a] = ngeo[a] - 2*bw
@ -1084,7 +1084,7 @@ function placement.align(d, args)
local sgeo = get_parent_geometry(d, args) local sgeo = get_parent_geometry(d, args)
local dgeo = geometry_common(d, args) local dgeo = geometry_common(d, args)
local bw = d.border_width or 0 local bw = (not args.ignore_border_width) and d.border_width or 0
local pos = align_map[args.position]( local pos = align_map[args.position](
sgeo.width , sgeo.width ,
@ -1169,7 +1169,7 @@ function placement.stretch(d, args)
local sgeo = get_parent_geometry(d, args) local sgeo = get_parent_geometry(d, args)
local dgeo = geometry_common(d, args) local dgeo = geometry_common(d, args)
local ngeo = geometry_common(d, args, nil, true) local ngeo = geometry_common(d, args, nil, true)
local bw = d.border_width or 0 local bw = (not args.ignore_border_width) and d.border_width or 0
if args.direction == "left" then if args.direction == "left" then
ngeo.x = sgeo.x ngeo.x = sgeo.x
@ -1231,7 +1231,7 @@ function placement.maximize(d, args)
local sgeo = get_parent_geometry(d, args) local sgeo = get_parent_geometry(d, args)
local ngeo = geometry_common(d, args, nil, true) local ngeo = geometry_common(d, args, nil, true)
local bw = d.border_width or 0 local bw = (not args.ignore_border_width) and d.border_width or 0
if (not args.axis) or args.axis :match "vertical" then if (not args.axis) or args.axis :match "vertical" then
ngeo.y = sgeo.y ngeo.y = sgeo.y
@ -1308,7 +1308,7 @@ function placement.scale(d, args)
end end
end end
local bw = d.border_width or 0 local bw = (not args.ignore_border_width) and d.border_width or 0
ngeo.width = ngeo.width - 2*bw ngeo.width = ngeo.width - 2*bw
ngeo.height = ngeo.height - 2*bw ngeo.height = ngeo.height - 2*bw