From: Josh Timmer <0ohexxo0@gmail.com> Date: Wed, 2 Sep 2015 03:29:29 +0000 (-0400) Subject: Added global border to wa.x and y instead of adding it every time we reference them X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/308b7b12020a59b5d0269772028c25a826ac10c0?ds=inline;hp=-c Added global border to wa.x and y instead of adding it every time we reference them --- 308b7b12020a59b5d0269772028c25a826ac10c0 diff --git a/layout/cascadetile.lua b/layout/cascadetile.lua index 734813a..b4fbc65 100644 --- a/layout/cascadetile.lua +++ b/layout/cascadetile.lua @@ -57,6 +57,8 @@ function cascadetile.arrange(p) -- Borders are factored in. wa.height = wa.height - (global_border * 2) wa.width = wa.width - (global_border * 2) + wa.x = wa.x + global_border + wa.y = wa.y + global_border -- Width of main column? local t = tag.selected(p.screen) @@ -101,8 +103,8 @@ function cascadetile.arrange(p) local g = {} -- Subtracting the useless_gap width from the work area width here -- makes this mwfact calculation work the same as in uselesstile. - -- Explicitly rounding is necessary to prevent the rendered size of - -- slavewid from changing depending on whether we round up or down. + -- Rounding is necessary to prevent the rendered size of slavewid + -- from being 1 pixel off when the result is not an integer. local mainwid = math.floor((wa.width - useless_gap) * mwfact) local slavewid = wa.width - mainwid @@ -121,8 +123,8 @@ function cascadetile.arrange(p) end g.height = wa.height - 2*c.border_width - g.x = wa.x + global_border - g.y = wa.y + global_border + g.x = wa.x + g.y = wa.y if useless_gap > 0 then -- Reduce width once and move window to the right. Reduce @@ -150,8 +152,8 @@ function cascadetile.arrange(p) g = {} 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 + g.x = wa.x + mainwid + (how_many - (i - 1)) * cascadetile.offset_x + g.y = wa.y + (i - 2) * cascadetile.offset_y if useless_gap > 0 then g.width = g.width - 2 * useless_gap diff --git a/layout/centerfair.lua b/layout/centerfair.lua index 597edce..d84f4a6 100644 --- a/layout/centerfair.lua +++ b/layout/centerfair.lua @@ -56,6 +56,8 @@ function centerfair.arrange(p) -- Borders are factored in. wa.height = wa.height - (global_border * 2) wa.width = wa.width - (global_border * 2) + wa.x = wa.x + global_border + wa.y = wa.y + global_border -- How many vertical columns? Read from nmaster on the tag. local t = tag.selected(p.screen) @@ -65,31 +67,28 @@ function centerfair.arrange(p) 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 - 1)*useless_gap) / 2 local g = {} - g.y = offset_y + global_border + g.y = wa.y + useless_gap for i = 1, #cls do 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 + g.x = offset_x + (i - 1) * (width + useless_gap) 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 - 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 + g.x = wa.x + useless_gap + g.y = wa.y + useless_gap c:geometry(g) @@ -135,7 +134,7 @@ function centerfair.arrange(p) for i = 1, (num_x-1) do local height = math.floor((wa.height - (num_y[i] + 1)*useless_gap) / num_y[i]) - g.y = offset_y + global_border + g.y = wa.y + useless_gap for j = 0, (num_y[i]-2) do local c = cls[nclient] g.height = height - 2*c.border_width diff --git a/layout/centerwork.lua b/layout/centerwork.lua index fa53274..1a45e2f 100644 --- a/layout/centerwork.lua +++ b/layout/centerwork.lua @@ -39,6 +39,8 @@ function centerwork.arrange(p) -- Borders are factored in. wa.height = wa.height - (global_border * 2) wa.width = wa.width - (global_border * 2) + wa.x = wa.x + global_border + wa.y = wa.y + global_border -- Width of main column? local t = awful.tag.selected(p.screen) @@ -58,8 +60,8 @@ function centerwork.arrange(p) 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 + g.x = wa.x + slaveLwid + g.y = wa.y + useless_gap c:geometry(g) @@ -83,29 +85,29 @@ function centerwork.arrange(p) if i - 2 == centerwork.top_left then -- top left - g.x = wa.x + useless_gap + global_border - g.y = wa.y + useless_gap + global_border + g.x = wa.x + useless_gap + g.y = wa.y + useless_gap 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.x = wa.x + slaveLwid + mainwid + useless_gap + g.y = wa.y + useless_gap 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.x = wa.x + useless_gap + g.y = wa.y + slaveThei + useless_gap 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.x = wa.x + slaveLwid + mainwid + useless_gap + g.y = wa.y + slaveThei + useless_gap g.width = slaveRwid - 2*useless_gap - 2*c.border_width g.height = slaveBhei - 2*useless_gap - 2*c.border_width end diff --git a/layout/termfair.lua b/layout/termfair.lua index 187cb46..6bb3e40 100644 --- a/layout/termfair.lua +++ b/layout/termfair.lua @@ -53,6 +53,8 @@ function termfair.arrange(p) -- Borders are factored in. wa.height = wa.height - (global_border * 2) wa.width = wa.width - (global_border * 2) + wa.x = wa.x + global_border + wa.y = wa.y + global_border -- How many vertical columns? local t = tag.selected(p.screen) @@ -101,8 +103,8 @@ function termfair.arrange(p) g.height = height - 2*c.border_width end - g.x = wa.x + this_x*width + global_border - g.y = wa.y + this_y*height + global_border + g.x = wa.x + this_x*width + g.y = wa.y + this_y*height if useless_gap > 0 then