local global_border = tonumber(beautiful.global_border_width) or 0
if global_border < 0 then global_border = 0 end
- -- Themes border width requires an offset
- local bw = tonumber(beautiful.border_width) or 0
-
-- Screen.
local wa = p.workarea
local cls = p.clients
-- Borders are factored in.
- wa.height = wa.height - ((global_border * 2) + (bw * 2))
- wa.width = wa.width - ((global_border * 2) + (bw * 2))
+ wa.height = wa.height - (global_border * 2)
+ wa.width = wa.width - (global_border * 2)
-- How many vertical columns? Read from nmaster on the tag.
local t = tag.selected(p.screen)
local ncol = centerfair.ncol or tag.getncol(t)
if num_x <= 2 then num_x = 2 end
- local width = math.floor((wa.width-(num_x+1)*useless_gap) / num_x)
+ local width = math.floor((wa.width - (num_x + 1)*useless_gap) / num_x)
local offset_y = wa.y + useless_gap
if #cls < num_x
then
-- Less clients than the number of columns, let's center it!
- local offset_x = wa.x + useless_gap + (wa.width - #cls*width - (#cls+1)*useless_gap) / 2
+ local offset_x = wa.x + (wa.width - #cls*width - (#cls - 1)*useless_gap) / 2
local g = {}
- g.width = width
- g.height = wa.height - 2*useless_gap - 2
g.y = offset_y + global_border
for i = 1, #cls do
- g.x = offset_x + (#cls - i) * (width + useless_gap + 2) + global_border
- cls[i]:geometry(g)
+ local c = cls[i]
+ g.width = width - 2*c.border_width
+ g.height = wa.height - 2*useless_gap - 2*c.border_width
+ g.x = offset_x + (i - 1) * (width + useless_gap) + global_border
+ c:geometry(g)
end
else
-- More clients than the number of columns, let's arrange it!
- local offset_x = wa.x
- if useless_gap > 0 then
- offset_x = offset_x
- end
+ local offset_x = wa.x + useless_gap
-- Master client deserves a special treatement
+ local c = cls[1]
local g = {}
- g.width = wa.width - (num_x - 1) * width - num_x * 2*useless_gap - 2
- g.height = wa.height - 2*useless_gap - 2
- g.x = offset_x + useless_gap + global_border
+ g.width = wa.width - (num_x - 1)*width - (num_x + 1)*useless_gap - 2*c.border_width
+ g.height = wa.height - 2*useless_gap - 2*c.border_width
+ g.x = offset_x + global_border
g.y = offset_y + global_border
- cls[#cls]:geometry(g)
+ c:geometry(g)
-- Treat the other clients
end
-- Compute geometry of the other clients
- local nclient = #cls-1 -- we start with the 2nd client
- g.x = g.x + g.width+useless_gap + 2
- g.width = width
-
- if useless_gap > 0 then
- g.width = g.width + useless_gap - 2
- end
+ local nclient = 2 -- we start with the 2nd client
+ g.x = g.x + g.width + useless_gap + 2*c.border_width
for i = 1, (num_x-1) do
- to_remove = 2
- g.height = math.floor((wa.height - (num_y[i] * useless_gap)) / num_y[i])
+ local height = math.floor((wa.height - (num_y[i] + 1)*useless_gap) / num_y[i])
g.y = offset_y + global_border
for j = 0, (num_y[i]-2) do
- cls[nclient]:geometry(g)
- nclient = nclient - 1
- g.y = g.y + g.height+useless_gap + 2
- to_remove = to_remove + 2
+ local c = cls[nclient]
+ g.height = height - 2*c.border_width
+ g.width = width - 2*c.border_width
+ c:geometry(g)
+ nclient = nclient + 1
+ g.y = g.y + height + useless_gap
end
- g.height = wa.height - num_y[i]*useless_gap - (num_y[i]-1)*g.height - useless_gap - to_remove
- cls[nclient]:geometry(g)
- nclient = nclient - 1
- g.x = g.x+g.width+useless_gap + 2
+ local c = cls[nclient]
+ g.height = wa.height - (num_y[i] + 1)*useless_gap - (num_y[i] - 1)*height - 2*c.border_width
+ g.width = width - 2*c.border_width
+ c:geometry(g)
+ nclient = nclient + 1
+ g.x = g.x + width + useless_gap
end
end
end