adam/lina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stopped assuming all clients use theme.border_width

Browse source
This commit is contained in:
Josh Timmer 2015-08-31 22:29:16 -04:00
parent ca49674459
commit efff8f4012
3 changed files with 38 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
layout/cascadetile.lua
View file

@ -50,9 +50,6 @@ function cascadetile.arrange(p)
local global_border = tonumber(beautiful.global_border_width) or 0 local global_border = tonumber(beautiful.global_border_width) or 0
if global_border < 0 then global_border = 0 end if global_border < 0 then global_border = 0 end
-- Themes border width requires an offset
local bw = tonumber(beautiful.border_width) or 0
-- Screen. -- Screen.
local wa = p.workarea local wa = p.workarea
local cls = p.clients local cls = p.clients
@ -111,7 +108,7 @@ function cascadetile.arrange(p)
if overlap_main == 1 if overlap_main == 1
then then
g.width = wa.width - 2*bw g.width = wa.width - 2*c.border_width
-- The size of the main window may be reduced a little bit. -- The size of the main window may be reduced a little bit.
-- This allows you to see if there are any windows below the -- This allows you to see if there are any windows below the
@ -120,10 +117,10 @@ function cascadetile.arrange(p)
-- overlapping everything else. -- overlapping everything else.
g.width = g.width - cascadetile.extra_padding g.width = g.width - cascadetile.extra_padding
else else
g.width = mainwid - 2*bw g.width = mainwid - 2*c.border_width
end end
g.height = wa.height - 2*bw g.height = wa.height - 2*c.border_width
g.x = wa.x + global_border g.x = wa.x + global_border
g.y = wa.y + global_border g.y = wa.y + global_border
if useless_gap > 0 if useless_gap > 0
@ -151,8 +148,8 @@ function cascadetile.arrange(p)
do do
c = cls[i] c = cls[i]
g = {} g = {}
g.width = slavewid - current_offset_x - 2*bw g.width = slavewid - current_offset_x - 2*c.border_width
g.height = wa.height - current_offset_y - 2*bw g.height = wa.height - current_offset_y - 2*c.border_width
g.x = wa.x + mainwid + (how_many - (i - 1)) * cascadetile.offset_x + global_border g.x = wa.x + mainwid + (how_many - (i - 1)) * cascadetile.offset_x + global_border
g.y = wa.y + (i - 2) * cascadetile.offset_y + global_border g.y = wa.y + (i - 2) * cascadetile.offset_y + global_border
if useless_gap > 0 if useless_gap > 0

43
layout/centerfair.lua
View file

@ -49,9 +49,6 @@ function centerfair.arrange(p)
local global_border = tonumber(beautiful.global_border_width) or 0 local global_border = tonumber(beautiful.global_border_width) or 0
if global_border < 0 then global_border = 0 end if global_border < 0 then global_border = 0 end
-- Themes border width requires an offset
local bw = tonumber(beautiful.border_width) or 0
-- Screen. -- Screen.
local wa = p.workarea local wa = p.workarea
local cls = p.clients local cls = p.clients
@ -66,33 +63,35 @@ function centerfair.arrange(p)
local ncol = centerfair.ncol or tag.getncol(t) local ncol = centerfair.ncol or tag.getncol(t)
if num_x <= 2 then num_x = 2 end if num_x <= 2 then num_x = 2 end
local width = math.floor((wa.width - (num_x + 1)*useless_gap - num_x*2*bw) / num_x) local width = math.floor((wa.width - (num_x + 1)*useless_gap) / num_x)
local offset_y = wa.y + useless_gap local offset_y = wa.y + useless_gap
if #cls < num_x if #cls < num_x
then then
-- Less clients than the number of columns, let's center it! -- Less clients than the number of columns, let's center it!
local offset_x = wa.x + (wa.width - #cls*width - #cls*2*bw - (#cls - 1)*useless_gap) / 2 local offset_x = wa.x + (wa.width - #cls*width - (#cls - 1)*useless_gap) / 2
local g = {} local g = {}
g.width = width
g.height = wa.height - 2*useless_gap - 2*bw
g.y = offset_y + global_border g.y = offset_y + global_border
for i = 1, #cls do for i = 1, #cls do
g.x = offset_x + (i - 1) * (width + useless_gap + 2*bw) + global_border local c = cls[i]
cls[i]:geometry(g) 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 end
else else
-- More clients than the number of columns, let's arrange it! -- More clients than the number of columns, let's arrange it!
local offset_x = wa.x + useless_gap local offset_x = wa.x + useless_gap
-- Master client deserves a special treatement -- Master client deserves a special treatement
local c = cls[1]
local g = {} local g = {}
g.width = wa.width - (num_x - 1)*width - (num_x + 1)*useless_gap - num_x*2*bw 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*bw g.height = wa.height - 2*useless_gap - 2*c.border_width
g.x = offset_x + global_border g.x = offset_x + global_border
g.y = offset_y + global_border g.y = offset_y + global_border
cls[1]:geometry(g) c:geometry(g)
-- Treat the other clients -- Treat the other clients
@ -132,21 +131,25 @@ function centerfair.arrange(p)
-- Compute geometry of the other clients -- Compute geometry of the other clients
local nclient = 2 -- we start with the 2nd client local nclient = 2 -- we start with the 2nd client
g.x = g.x + g.width + useless_gap + 2*bw g.x = g.x + g.width + useless_gap + 2*c.border_width
g.width = width
for i = 1, (num_x-1) do for i = 1, (num_x-1) do
g.height = math.floor((wa.height - (num_y[i] + 1)*useless_gap - num_y[i]*2*bw) / num_y[i]) local height = math.floor((wa.height - (num_y[i] + 1)*useless_gap) / num_y[i])
g.y = offset_y + global_border g.y = offset_y + global_border
for j = 0, (num_y[i]-2) do for j = 0, (num_y[i]-2) do
cls[nclient]:geometry(g) local c = cls[nclient]
g.height = height - 2*c.border_width
g.width = width - 2*c.border_width
c:geometry(g)
nclient = nclient + 1 nclient = nclient + 1
g.y = g.y + g.height + useless_gap + 2*bw g.y = g.y + height + useless_gap
end end
g.height = wa.height - (num_y[i] + 1)*useless_gap - (num_y[i] - 1)*g.height - num_y[i]*2*bw local c = cls[nclient]
cls[nclient]:geometry(g) 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 nclient = nclient + 1
g.x = g.x + g.width + useless_gap + 2*bw g.x = g.x + width + useless_gap
end end
end end
end end

23
layout/centerwork.lua
View file

@ -32,9 +32,6 @@ function centerwork.arrange(p)
local global_border = tonumber(beautiful.global_border_width) or 0 local global_border = tonumber(beautiful.global_border_width) or 0
if global_border < 0 then global_border = 0 end if global_border < 0 then global_border = 0 end
-- Themes border width requires an offset
local bw = tonumber(beautiful.border_width) or 0
-- Screen. -- Screen.
local wa = p.workarea local wa = p.workarea
local cls = p.clients local cls = p.clients
@ -59,8 +56,8 @@ function centerwork.arrange(p)
local slaveThei = math.floor(wa.height / 2) local slaveThei = math.floor(wa.height / 2)
local slaveBhei = wa.height - slaveThei local slaveBhei = wa.height - slaveThei
g.height = wa.height - 2*useless_gap - 2*bw g.height = wa.height - 2*useless_gap - 2*c.border_width
g.width = mainwid - 2*bw g.width = mainwid - 2*c.border_width
g.x = wa.x + slaveLwid + global_border g.x = wa.x + slaveLwid + global_border
g.y = wa.y + useless_gap + global_border g.y = wa.y + useless_gap + global_border
@ -88,29 +85,29 @@ function centerwork.arrange(p)
-- top left -- top left
g.x = wa.x + useless_gap + global_border g.x = wa.x + useless_gap + global_border
g.y = wa.y + useless_gap + global_border g.y = wa.y + useless_gap + global_border
g.width = slaveLwid - 2*useless_gap - 2*bw g.width = slaveLwid - 2*useless_gap - 2*c.border_width
g.height = slaveThei - useless_gap - 2*bw g.height = slaveThei - useless_gap - 2*c.border_width
elseif i - 2 == centerwork.top_right elseif i - 2 == centerwork.top_right
then then
-- top right -- top right
g.x = wa.x + slaveLwid + mainwid + useless_gap + global_border g.x = wa.x + slaveLwid + mainwid + useless_gap + global_border
g.y = wa.y + useless_gap + global_border g.y = wa.y + useless_gap + global_border
g.width = slaveRwid - 2*useless_gap - 2*bw g.width = slaveRwid - 2*useless_gap - 2*c.border_width
g.height = slaveThei - useless_gap - 2*bw g.height = slaveThei - useless_gap - 2*c.border_width
elseif i - 2 == centerwork.bottom_left elseif i - 2 == centerwork.bottom_left
then then
-- bottom left -- bottom left
g.x = wa.x + useless_gap + global_border g.x = wa.x + useless_gap + global_border
g.y = wa.y + slaveThei + useless_gap + global_border g.y = wa.y + slaveThei + useless_gap + global_border
g.width = slaveLwid - 2*useless_gap - 2*bw g.width = slaveLwid - 2*useless_gap - 2*c.border_width
g.height = slaveBhei - 2*useless_gap - 2*bw g.height = slaveBhei - 2*useless_gap - 2*c.border_width
elseif i - 2 == centerwork.bottom_right elseif i - 2 == centerwork.bottom_right
then then
-- bottom right -- bottom right
g.x = wa.x + slaveLwid + mainwid + useless_gap + global_border g.x = wa.x + slaveLwid + mainwid + useless_gap + global_border
g.y = wa.y + slaveThei + useless_gap + global_border g.y = wa.y + slaveThei + useless_gap + global_border
g.width = slaveRwid - 2*useless_gap - 2*bw g.width = slaveRwid - 2*useless_gap - 2*c.border_width
g.height = slaveBhei - 2*useless_gap - 2*bw g.height = slaveBhei - 2*useless_gap - 2*c.border_width
end end
c:geometry(g) c:geometry(g)