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

tile: Apply size hints correctly (#2305) 

Layouts work with the client's geometry in "space on screen that is
assigned to this client". This means that the geometry should include
decoration (titlebar and borders) and useless gaps.

Everything else (especially the C code) works with client's geometry in
"space that the client can draw on". This means that the titlebar,
borders and the useless gaps are not included into this size.

Thus, when applying size hints, the tile layout has to convert between
these two representations. Otherwise, size hints are applied incorrectly
and to a wrong geometry.

Fixes: https://github.com/awesomeWM/awesome/issues/1418
Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2018-07-21 20:53:30 +02:00 committed by Yauhen Kirylau
parent abf847961e
commit 3e24303f15
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/awful/layout/suit/tile.lua
View File

@ -158,7 +158,14 @@ local function mouse_resize_handler(c, _, _, _, orientation)
end, cursor) end, cursor)
end end
local function tile_group(gs, cls, wa, orientation, fact, group) local function apply_size_hints(c, width, height, useless_gap)
local bw = c.border_width
width, height = width - 2 * bw - useless_gap, height - 2 * bw - useless_gap
width, height = c:apply_size_hints(math.max(1, width), math.max(1, height))
return width + 2 * bw + useless_gap, height + 2 * bw + useless_gap
end
local function tile_group(gs, cls, wa, orientation, fact, group, useless_gap)
-- get our orientation right -- get our orientation right
local height = "height" local height = "height"
local width = "width" local width = "width"
@ -207,7 +214,7 @@ local function tile_group(gs, cls, wa, orientation, fact, group)
geom[x] = group.coord geom[x] = group.coord
geom[y] = coord geom[y] = coord
gs[cls[c]] = geom gs[cls[c]] = geom
hints.width, hints.height = cls[c]:apply_size_hints(geom.width, geom.height) hints.width, hints.height = apply_size_hints(cls[c], geom.width, geom.height, useless_gap)
coord = coord + hints[height] coord = coord + hints[height]
unused = unused - hints[height] unused = unused - hints[height]
total_fact = total_fact - fact[i] total_fact = total_fact - fact[i]
@ -231,6 +238,7 @@ local function do_tile(param, orientation)
local gs = param.geometries local gs = param.geometries
local cls = param.clients local cls = param.clients
local useless_gap = param.useless_gap
local nmaster = math.min(t.master_count, #cls) local nmaster = math.min(t.master_count, #cls)
local nother = math.max(#cls - nmaster,0) local nother = math.max(#cls - nmaster,0)
@ -267,7 +275,7 @@ local function do_tile(param, orientation)
data[0] = {} data[0] = {}
end end
coord = coord + tile_group(gs, cls, wa, orientation, data[0], coord = coord + tile_group(gs, cls, wa, orientation, data[0],
{first=1, last=nmaster, coord = coord, size = size}) {first=1, last=nmaster, coord = coord, size = size}, useless_gap)
end end
if not place_master and nother > 0 then if not place_master and nother > 0 then
@ -288,7 +296,7 @@ local function do_tile(param, orientation)
data[i] = {} data[i] = {}
end end
coord = coord + tile_group(gs, cls, wa, orientation, data[i], coord = coord + tile_group(gs, cls, wa, orientation, data[i],
{ first = first, last = last, coord = coord, size = size }) { first = first, last = last, coord = coord, size = size }, useless_gap)
end end
end end
place_master = not place_master place_master = not place_master