From efff8f40122239edd3d34e95512a6d73c86d8930 Mon Sep 17 00:00:00 2001 From: Josh Timmer <0ohexxo0@gmail.com> Date: Mon, 31 Aug 2015 22:29:16 -0400 Subject: [PATCH] Stopped assuming all clients use theme.border_width --- layout/cascadetile.lua | 13 +++++-------- layout/centerfair.lua | 43 ++++++++++++++++++++++-------------------- layout/centerwork.lua | 23 ++++++++++------------ 3 files changed, 38 insertions(+), 41 deletions(-) diff --git a/layout/cascadetile.lua b/layout/cascadetile.lua index d1e48e4..734813a 100644 --- a/layout/cascadetile.lua +++ b/layout/cascadetile.lua @@ -50,9 +50,6 @@ function cascadetile.arrange(p) 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 @@ -111,7 +108,7 @@ function cascadetile.arrange(p) if overlap_main == 1 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. -- This allows you to see if there are any windows below the @@ -120,10 +117,10 @@ function cascadetile.arrange(p) -- overlapping everything else. g.width = g.width - cascadetile.extra_padding else - g.width = mainwid - 2*bw + g.width = mainwid - 2*c.border_width end - g.height = wa.height - 2*bw + g.height = wa.height - 2*c.border_width g.x = wa.x + global_border g.y = wa.y + global_border if useless_gap > 0 @@ -151,8 +148,8 @@ function cascadetile.arrange(p) do c = cls[i] g = {} - g.width = slavewid - current_offset_x - 2*bw - g.height = wa.height - current_offset_y - 2*bw + g.width = slavewid - current_offset_x - 2*c.border_width + 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.y = wa.y + (i - 2) * cascadetile.offset_y + global_border if useless_gap > 0 diff --git a/layout/centerfair.lua b/layout/centerfair.lua index 3a964ab..597edce 100644 --- a/layout/centerfair.lua +++ b/layout/centerfair.lua @@ -49,9 +49,6 @@ function centerfair.arrange(p) 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 @@ -66,33 +63,35 @@ function centerfair.arrange(p) 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*2*bw) / 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 + (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 = {} - g.width = width - g.height = wa.height - 2*useless_gap - 2*bw g.y = offset_y + global_border for i = 1, #cls do - g.x = offset_x + (i - 1) * (width + useless_gap + 2*bw) + 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 + useless_gap -- Master client deserves a special treatement + local c = cls[1] local g = {} - g.width = wa.width - (num_x - 1)*width - (num_x + 1)*useless_gap - num_x*2*bw - g.height = wa.height - 2*useless_gap - 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*c.border_width g.x = offset_x + global_border g.y = offset_y + global_border - cls[1]:geometry(g) + c:geometry(g) -- Treat the other clients @@ -132,21 +131,25 @@ function centerfair.arrange(p) -- Compute geometry of the other clients local nclient = 2 -- we start with the 2nd client - g.x = g.x + g.width + useless_gap + 2*bw - g.width = width + g.x = g.x + g.width + useless_gap + 2*c.border_width 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 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 - g.y = g.y + g.height + useless_gap + 2*bw + g.y = g.y + height + useless_gap end - g.height = wa.height - (num_y[i] + 1)*useless_gap - (num_y[i] - 1)*g.height - num_y[i]*2*bw - cls[nclient]:geometry(g) + 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 + g.width + useless_gap + 2*bw + g.x = g.x + width + useless_gap end end end diff --git a/layout/centerwork.lua b/layout/centerwork.lua index 6873844..fa53274 100644 --- a/layout/centerwork.lua +++ b/layout/centerwork.lua @@ -32,9 +32,6 @@ function centerwork.arrange(p) 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 @@ -59,8 +56,8 @@ function centerwork.arrange(p) local slaveThei = math.floor(wa.height / 2) local slaveBhei = wa.height - slaveThei - g.height = wa.height - 2*useless_gap - 2*bw - g.width = mainwid - 2*bw + g.height = wa.height - 2*useless_gap - 2*c.border_width + g.width = mainwid - 2*c.border_width g.x = wa.x + slaveLwid + global_border g.y = wa.y + useless_gap + global_border @@ -88,29 +85,29 @@ function centerwork.arrange(p) -- top left g.x = wa.x + useless_gap + global_border g.y = wa.y + useless_gap + global_border - g.width = slaveLwid - 2*useless_gap - 2*bw - g.height = slaveThei - useless_gap - 2*bw + g.width = slaveLwid - 2*useless_gap - 2*c.border_width + g.height = slaveThei - useless_gap - 2*c.border_width elseif i - 2 == centerwork.top_right then -- top right g.x = wa.x + slaveLwid + mainwid + useless_gap + global_border g.y = wa.y + useless_gap + global_border - g.width = slaveRwid - 2*useless_gap - 2*bw - g.height = slaveThei - useless_gap - 2*bw + g.width = slaveRwid - 2*useless_gap - 2*c.border_width + g.height = slaveThei - useless_gap - 2*c.border_width elseif i - 2 == centerwork.bottom_left then -- bottom left g.x = wa.x + useless_gap + global_border g.y = wa.y + slaveThei + useless_gap + global_border - g.width = slaveLwid - 2*useless_gap - 2*bw - g.height = slaveBhei - 2*useless_gap - 2*bw + g.width = slaveLwid - 2*useless_gap - 2*c.border_width + g.height = slaveBhei - 2*useless_gap - 2*c.border_width elseif i - 2 == centerwork.bottom_right then -- bottom right g.x = wa.x + slaveLwid + mainwid + useless_gap + global_border g.y = wa.y + slaveThei + useless_gap + global_border - g.width = slaveRwid - 2*useless_gap - 2*bw - g.height = slaveBhei - 2*useless_gap - 2*bw + g.width = slaveRwid - 2*useless_gap - 2*c.border_width + g.height = slaveBhei - 2*useless_gap - 2*c.border_width end c:geometry(g)