awesomewm-mirrors
/
lain
mirror of https://github.com/lcpz/lain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Applied border adjustment changes to cascade and termfair, updated termfair to apply useless_gaps the same as other layouts

This commit is contained in:
Josh Timmer 2015-08-31 23:14:56 -04:00
parent efff8f4012
commit ce6d75bb8e
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
layout/cascade.lua
View File

@ -28,15 +28,12 @@ function cascade.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
wa.height = wa.height - ((global_border * 2) + (bw * 2)) wa.height = wa.height - (global_border * 2)
wa.width = wa.width - ((global_border * 2) + (bw * 2)) wa.width = wa.width - (global_border * 2)
wa.x = wa.x + global_border wa.x = wa.x + global_border
wa.y = wa.y + global_border wa.y = wa.y + global_border
@ -70,8 +67,8 @@ function cascade.arrange(p)
g.x = wa.x + (how_many - i) * cascade.offset_x g.x = wa.x + (how_many - i) * cascade.offset_x
g.y = wa.y + (i - 1) * cascade.offset_y g.y = wa.y + (i - 1) * cascade.offset_y
g.width = wa.width - current_offset_x g.width = wa.width - current_offset_x - 2*c.border_width
g.height = wa.height - current_offset_y g.height = wa.height - current_offset_y - 2*c.border_width
c:geometry(g) c:geometry(g)
end end

27
layout/termfair.lua
View File

@ -46,16 +46,13 @@ function termfair.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
-- Borders are factored in. -- Borders are factored in.
wa.height = wa.height - ((global_border * 2) + (bw * 2)) wa.height = wa.height - (global_border * 2)
wa.width = wa.width - ((global_border * 2) + (bw * 2)) wa.width = wa.width - (global_border * 2)
-- How many vertical columns? -- How many vertical columns?
local t = tag.selected(p.screen) local t = tag.selected(p.screen)
@ -71,8 +68,8 @@ function termfair.arrange(p)
local at_x = 0 local at_x = 0
local at_y = 0 local at_y = 0
local remaining_clients = #cls local remaining_clients = #cls
local width = math.floor(wa.width / num_x) local width = math.floor((wa.width - (num_x + 1)*useless_gap) / num_x)
local height = math.floor(wa.height / num_y) local height = math.floor((wa.height - (num_y + 1)*useless_gap) / num_y)
-- We start the first row. Left-align by limiting the number of -- We start the first row. Left-align by limiting the number of
-- available slots. -- available slots.
@ -93,25 +90,25 @@ function termfair.arrange(p)
local g = {} local g = {}
if this_x == (num_x - 1) if this_x == (num_x - 1)
then then
g.width = wa.width - (num_x - 1) * width - useless_gap g.width = wa.width - (num_x - 1)*width - (num_x + 1)*useless_gap - 2*c.border_width
else else
g.width = width - useless_gap g.width = width - 2*c.border_width
end end
if this_y == (num_y - 1) if this_y == (num_y - 1)
then then
g.height = wa.height - (num_y - 1) * height - useless_gap g.height = wa.height - (num_y - 1)*height - (num_y + 1)*useless_gap - 2*c.border_width
else else
g.height = height - useless_gap g.height = height - 2*c.border_width
end end
g.x = wa.x + this_x * width + global_border g.x = wa.x + this_x*width + global_border
g.y = wa.y + this_y * height + global_border g.y = wa.y + this_y*height + global_border
if useless_gap > 0 if useless_gap > 0
then then
-- All clients tile evenly. -- All clients tile evenly.
g.x = g.x + (useless_gap / 2) g.x = g.x + (this_x + 1)*useless_gap
g.y = g.y + (useless_gap / 2) g.y = g.y + (this_y + 1)*useless_gap
end end
c:geometry(g) c:geometry(g)