]> git.madduck.net Git - etc/awesome.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Cleanup and standardization in centerfair
authorJosh Timmer <0ohexxo0@gmail.com>
Mon, 31 Aug 2015 05:09:05 +0000 (01:09 -0400)
committerJosh Timmer <0ohexxo0@gmail.com>
Mon, 31 Aug 2015 05:09:05 +0000 (01:09 -0400)
layout/centerfair.lua

index 2447b55a70ae35c908da55a5857d0e2ea3fbb52d..3a964ab0662b70756dd4283802b97f6db6992950 100644 (file)
@@ -83,16 +83,13 @@ function centerfair.arrange(p)
         end
     else
         -- More clients than the number of columns, let's arrange it!
         end
     else
         -- More clients than the number of columns, let's arrange it!
-        local offset_x = wa.x
-        if useless_gap > 0 then
-           offset_x = offset_x
-        end
+        local offset_x = wa.x + useless_gap
 
         -- Master client deserves a special treatement
         local g = {}
 
         -- Master client deserves a special treatement
         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 - num_x*2*bw
         g.height = wa.height - 2*useless_gap - 2*bw
         g.height = wa.height - 2*useless_gap - 2*bw
-        g.x = offset_x + useless_gap + global_border
+        g.x = offset_x + global_border
         g.y = offset_y + global_border
 
         cls[1]:geometry(g)
         g.y = offset_y + global_border
 
         cls[1]:geometry(g)
@@ -135,7 +132,7 @@ function centerfair.arrange(p)
 
         -- Compute geometry of the other clients
         local nclient = 2 -- we start with the 2nd client
 
         -- Compute geometry of the other clients
         local nclient = 2 -- we start with the 2nd client
-        g.x = g.x + g.width + 2*bw + useless_gap
+        g.x = g.x + g.width + useless_gap + 2*bw
         g.width = width
 
         for i = 1, (num_x-1) do
         g.width = width
 
         for i = 1, (num_x-1) do
@@ -144,12 +141,12 @@ function centerfair.arrange(p)
             for j = 0, (num_y[i]-2) do
                 cls[nclient]:geometry(g)
                 nclient = nclient + 1
             for j = 0, (num_y[i]-2) do
                 cls[nclient]:geometry(g)
                 nclient = nclient + 1
-                g.y = g.y + g.height + 2*bw + useless_gap
+                g.y = g.y + g.height + useless_gap + 2*bw
             end
             end
-            g.height = wa.height - (num_y[i] + 1)*useless_gap - (num_y[i]-1)*g.height - num_y[i]*2*bw
+            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)
             nclient = nclient + 1
             cls[nclient]:geometry(g)
             nclient = nclient + 1
-            g.x = g.x + g.width + 2*bw + useless_gap
+            g.x = g.x + g.width + useless_gap + 2*bw
         end
     end
 end
         end
     end
 end