]> git.madduck.net Git - etc/awesome.git/blobdiff - layout/centerwork.lua

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:

projects / etc / awesome.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
#198 fix attempt 3: patch on DST check
[etc/awesome.git] / layout / centerwork.lua
diff --git a/layout/centerwork.lua b/layout/centerwork.lua
index 939f18c3d467bed574cd444726069dead33d12e0..954826e0793d72c60d1962f14d48c0e870d9716c 100644 (file)
--- a/layout/centerwork.lua
+++ b/layout/centerwork.lua
@@ -2,6 +2,7 @@
 --[[
                                                   
      Licensed under GNU General Public License v2 
 --[[
                                                   
      Licensed under GNU General Public License v2 
+      * (c) 2014,      projektile                 
       * (c) 2013,      Luke Bonham                
       * (c) 2010-2012, Peter Hofmann              
                                                   
       * (c) 2013,      Luke Bonham                
       * (c) 2010-2012, Peter Hofmann              
                                                   
@@ -15,10 +16,10 @@ local math      = { floor = math.floor }
 local centerwork =
 {
     name         = "centerwork",
 local centerwork =
 {
     name         = "centerwork",
-    top_left     = 0,
-    top_right    = 1,
+    top_right    = 0,
+    bottom_right = 1,
     bottom_left  = 2,
     bottom_left  = 2,
-    bottom_right = 3
+    top_left     = 3
 }
 
 function centerwork.arrange(p)
 }
 
 function centerwork.arrange(p)
@@ -26,10 +27,21 @@ function centerwork.arrange(p)
     -- beautiful.useless_gap_width .
     local useless_gap = tonumber(beautiful.useless_gap_width) or 0
 
     -- beautiful.useless_gap_width .
     local useless_gap = tonumber(beautiful.useless_gap_width) or 0
 
+    -- A global border can be defined with
+    -- beautiful.global_border_width
+    local global_border = tonumber(beautiful.global_border_width) or 0
+    if global_border < 0 then global_border = 0 end
+
     -- Screen.
     local wa = p.workarea
     local cls = p.clients
 
     -- Screen.
     local wa = p.workarea
     local cls = p.clients
 
+    -- 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)
     local mwfact = awful.tag.getmwfact(t)
     -- Width of main column?
     local t = awful.tag.selected(p.screen)
     local mwfact = awful.tag.getmwfact(t)
@@ -45,19 +57,23 @@ function centerwork.arrange(p)
         local slaveRwid = slavewid - slaveLwid
         local slaveThei = math.floor(wa.height / 2)
         local slaveBhei = wa.height - slaveThei
         local slaveRwid = slavewid - slaveLwid
         local slaveThei = math.floor(wa.height / 2)
         local slaveBhei = wa.height - slaveThei
+        local Thalfgap = math.floor(useless_gap / 2)
+        local Bhalfgap = useless_gap - Thalfgap
 
 
-        g.height = wa.height - 2 * useless_gap
-        g.width = mainwid
+        g.height = wa.height - 2*useless_gap - 2*c.border_width
+        g.width = mainwid - 2*c.border_width
         g.x = wa.x + slaveLwid
         g.y = wa.y + useless_gap
 
         g.x = wa.x + slaveLwid
         g.y = wa.y + useless_gap
 
+        if g.width < 1 then g.width = 1 end
+        if g.height < 1 then g.height = 1 end
         c:geometry(g)
 
         -- Auxiliary windows.
         if #cls > 1
         then
             local at = 0
         c:geometry(g)
 
         -- Auxiliary windows.
         if #cls > 1
         then
             local at = 0
-            for i = (#cls),2,-1
+            for i = 2,#cls
             do
                 -- It's all fixed. If there are more than 5 clients,
                 -- those additional clients will float. This is
             do
                 -- It's all fixed. If there are more than 5 clients,
                 -- those additional clients will float. This is
@@ -70,36 +86,38 @@ function centerwork.arrange(p)
                 c = cls[i]
                 g = {}
 
                 c = cls[i]
                 g = {}
 
-                if at == centerwork.top_left
+                if i - 2 == centerwork.top_left
                 then
                     -- top left
                     g.x = wa.x + useless_gap
                     g.y = wa.y + useless_gap
                 then
                     -- top left
                     g.x = wa.x + useless_gap
                     g.y = wa.y + useless_gap
-                    g.width = slaveLwid - 2 * useless_gap
-                    g.height = slaveThei - useless_gap
-                elseif at == centerwork.top_right
+                    g.width = slaveLwid - 2*useless_gap - 2*c.border_width
+                    g.height = slaveThei - useless_gap - Thalfgap - 2*c.border_width
+                elseif i - 2 == centerwork.top_right
                 then
                     -- top right
                     g.x = wa.x + slaveLwid + mainwid + useless_gap
                     g.y = wa.y + useless_gap
                 then
                     -- top right
                     g.x = wa.x + slaveLwid + mainwid + useless_gap
                     g.y = wa.y + useless_gap
-                    g.width = slaveRwid - 2 * useless_gap
-                    g.height = slaveThei - useless_gap
-                elseif at == centerwork.bottom_left
+                    g.width = slaveRwid - 2*useless_gap - 2*c.border_width
+                    g.height = slaveThei - useless_gap - Thalfgap - 2*c.border_width
+                elseif i - 2 == centerwork.bottom_left
                 then
                     -- bottom left
                     g.x = wa.x + useless_gap
                 then
                     -- bottom left
                     g.x = wa.x + useless_gap
-                    g.y = wa.y + slaveThei + useless_gap
-                    g.width = slaveLwid - 2 * useless_gap
-                    g.height = slaveBhei - 2 * useless_gap
-                elseif at == centerwork.bottom_right
+                    g.y = wa.y + slaveThei + Bhalfgap
+                    g.width = slaveLwid - 2*useless_gap - 2*c.border_width
+                    g.height = slaveBhei - useless_gap - Bhalfgap - 2*c.border_width
+                elseif i - 2 == centerwork.bottom_right
                 then
                     -- bottom right
                     g.x = wa.x + slaveLwid + mainwid + useless_gap
                 then
                     -- bottom right
                     g.x = wa.x + slaveLwid + mainwid + useless_gap
-                    g.y = wa.y + slaveThei + useless_gap
-                    g.width = slaveRwid - 2 * useless_gap
-                    g.height = slaveBhei - 2 * useless_gap
+                    g.y = wa.y + slaveThei + Bhalfgap
+                    g.width = slaveRwid - 2*useless_gap - 2*c.border_width
+                    g.height = slaveBhei - useless_gap - Bhalfgap - 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)
 
                 at = at + 1
                 c:geometry(g)
 
                 at = at + 1
awesome window-manager configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.