Fixes for the silly case where a client's borders are bigger than its allotted space

This commit is contained in:
Josh Timmer 2015-09-08 20:19:55 -04:00
parent 308b7b1202
commit b658401b33
5 changed files with 20 additions and 0 deletions

View File

@ -69,6 +69,8 @@ function cascade.arrange(p)
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 - 2*c.border_width g.width = wa.width - current_offset_x - 2*c.border_width
g.height = wa.height - current_offset_y - 2*c.border_width g.height = wa.height - current_offset_y - 2*c.border_width
if g.width < 1 then g.width = 1 end
if g.height < 1 then g.height = 1 end
c:geometry(g) c:geometry(g)
end end

View File

@ -141,6 +141,8 @@ function cascadetile.arrange(p)
g.width = g.width - useless_gap g.width = g.width - useless_gap
end end
end end
if g.width < 1 then g.width = 1 end
if g.height < 1 then g.height = 1 end
c:geometry(g) c:geometry(g)
-- Remaining clients stacked in slave column, new ones on top. -- Remaining clients stacked in slave column, new ones on top.
@ -161,6 +163,8 @@ function cascadetile.arrange(p)
g.x = g.x + useless_gap g.x = g.x + useless_gap
g.y = g.y + useless_gap g.y = g.y + useless_gap
end end
if g.width < 1 then g.width = 1 end
if g.height < 1 then g.height = 1 end
c:geometry(g) c:geometry(g)
end end
end end

View File

@ -77,6 +77,8 @@ function centerfair.arrange(p)
local c = cls[i] local c = cls[i]
g.width = width - 2*c.border_width g.width = width - 2*c.border_width
g.height = wa.height - 2*useless_gap - 2*c.border_width g.height = wa.height - 2*useless_gap - 2*c.border_width
if g.width < 1 then g.width = 1 end
if g.height < 1 then g.height = 1 end
g.x = offset_x + (i - 1) * (width + useless_gap) g.x = offset_x + (i - 1) * (width + useless_gap)
c:geometry(g) c:geometry(g)
end end
@ -87,6 +89,8 @@ function centerfair.arrange(p)
local g = {} local g = {}
g.width = wa.width - (num_x - 1)*width - (num_x + 1)*useless_gap - 2*c.border_width 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.height = wa.height - 2*useless_gap - 2*c.border_width
if g.width < 1 then g.width = 1 end
if g.height < 1 then g.height = 1 end
g.x = wa.x + useless_gap g.x = wa.x + useless_gap
g.y = wa.y + useless_gap g.y = wa.y + useless_gap
@ -139,6 +143,8 @@ function centerfair.arrange(p)
local c = cls[nclient] local c = cls[nclient]
g.height = height - 2*c.border_width g.height = height - 2*c.border_width
g.width = width - 2*c.border_width g.width = width - 2*c.border_width
if g.width < 1 then g.width = 1 end
if g.height < 1 then g.height = 1 end
c:geometry(g) c:geometry(g)
nclient = nclient + 1 nclient = nclient + 1
g.y = g.y + height + useless_gap g.y = g.y + height + useless_gap
@ -146,6 +152,8 @@ function centerfair.arrange(p)
local c = cls[nclient] local c = cls[nclient]
g.height = wa.height - (num_y[i] + 1)*useless_gap - (num_y[i] - 1)*height - 2*c.border_width 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 g.width = width - 2*c.border_width
if g.width < 1 then g.width = 1 end
if g.height < 1 then g.height = 1 end
c:geometry(g) c:geometry(g)
nclient = nclient + 1 nclient = nclient + 1
g.x = g.x + width + useless_gap g.x = g.x + width + useless_gap

View File

@ -60,6 +60,8 @@ function centerwork.arrange(p)
g.height = wa.height - 2*useless_gap - 2*c.border_width g.height = wa.height - 2*useless_gap - 2*c.border_width
g.width = mainwid - 2*c.border_width g.width = mainwid - 2*c.border_width
if g.width < 1 then g.width = 1 end
if g.height < 1 then g.height = 1 end
g.x = wa.x + slaveLwid g.x = wa.x + slaveLwid
g.y = wa.y + useless_gap g.y = wa.y + useless_gap
@ -112,6 +114,8 @@ function centerwork.arrange(p)
g.height = slaveBhei - 2*useless_gap - 2*c.border_width g.height = slaveBhei - 2*useless_gap - 2*c.border_width
end end
if g.width < 1 then g.width = 1 end
if g.height < 1 then g.height = 1 end
c:geometry(g) c:geometry(g)
at = at + 1 at = at + 1

View File

@ -113,6 +113,8 @@ function termfair.arrange(p)
g.y = g.y + (this_y + 1)*useless_gap g.y = g.y + (this_y + 1)*useless_gap
end end
if g.width < 1 then g.width = 1 end
if g.height < 1 then g.height = 1 end
c:geometry(g) c:geometry(g)
remaining_clients = remaining_clients - 1 remaining_clients = remaining_clients - 1