]> 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
Merge pull request #107 from OlegHahm/floor_smapi
[etc/awesome.git] / layout / centerwork.lua
diff --git a/layout/centerwork.lua b/layout/centerwork.lua
index 2035c655d1c71e4b45eddb0f922eeb3477bfbada..61f4907b78d1f581f11d013a467ff72a5af3ea00 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              
                                                   
@@ -24,16 +25,24 @@ local centerwork =
 function centerwork.arrange(p)
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width .
 function centerwork.arrange(p)
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width .
-    local useless_gap = tonumber(beautiful.useless_gap_width)
-    if useless_gap == nil
-    then
-        useless_gap = 0
-    end
+    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
+
+    -- Themes border width requires an offset
+    local bw = tonumber(beautiful.border_width) or 0
 
     -- 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) + (bw * 2))
+    wa.width = wa.width - ((global_border * 2) + (bw * 2))
+
     -- 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)
@@ -52,8 +61,8 @@ function centerwork.arrange(p)
 
         g.height = wa.height - 2 * useless_gap
         g.width = mainwid
 
         g.height = wa.height - 2 * useless_gap
         g.width = mainwid
-        g.x = wa.x + slaveLwid
-        g.y = wa.y + useless_gap
+        g.x = wa.x + slaveLwid + global_border
+        g.y = wa.y + useless_gap + global_border
 
         c:geometry(g)
 
 
         c:geometry(g)
 
@@ -77,29 +86,29 @@ function centerwork.arrange(p)
                 if at == centerwork.top_left
                 then
                     -- top left
                 if at == centerwork.top_left
                 then
                     -- top left
-                    g.x = wa.x + useless_gap
-                    g.y = wa.y + useless_gap
+                    g.x = wa.x + useless_gap + global_border
+                    g.y = wa.y + useless_gap + global_border
                     g.width = slaveLwid - 2 * useless_gap
                     g.height = slaveThei - useless_gap
                 elseif at == centerwork.top_right
                 then
                     -- top right
                     g.width = slaveLwid - 2 * useless_gap
                     g.height = slaveThei - useless_gap
                 elseif at == centerwork.top_right
                 then
                     -- top right
-                    g.x = wa.x + slaveLwid + mainwid + useless_gap
-                    g.y = wa.y + useless_gap
+                    g.x = wa.x + slaveLwid + mainwid + useless_gap + global_border
+                    g.y = wa.y + useless_gap + global_border
                     g.width = slaveRwid - 2 * useless_gap
                     g.height = slaveThei - useless_gap
                 elseif at == centerwork.bottom_left
                 then
                     -- bottom left
                     g.width = slaveRwid - 2 * useless_gap
                     g.height = slaveThei - useless_gap
                 elseif at == centerwork.bottom_left
                 then
                     -- bottom left
-                    g.x = wa.x + useless_gap
-                    g.y = wa.y + slaveThei + useless_gap
+                    g.x = wa.x + useless_gap + global_border
+                    g.y = wa.y + slaveThei + useless_gap + global_border
                     g.width = slaveLwid - 2 * useless_gap
                     g.height = slaveBhei - 2 * useless_gap
                 elseif at == centerwork.bottom_right
                 then
                     -- bottom right
                     g.width = slaveLwid - 2 * useless_gap
                     g.height = slaveBhei - 2 * useless_gap
                 elseif at == centerwork.bottom_right
                 then
                     -- bottom right
-                    g.x = wa.x + slaveLwid + mainwid + useless_gap
-                    g.y = wa.y + slaveThei + useless_gap
+                    g.x = wa.x + slaveLwid + mainwid + useless_gap + global_border
+                    g.y = wa.y + slaveThei + useless_gap + global_border
                     g.width = slaveRwid - 2 * useless_gap
                     g.height = slaveBhei - 2 * useless_gap
                 end
                     g.width = slaveRwid - 2 * useless_gap
                     g.height = slaveBhei - 2 * useless_gap
                 end
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.