From a37c5f895fa6c04fc2d5572aa9d2d335cd5b40d4 Mon Sep 17 00:00:00 2001
From: Stefan O'Rear <stefanor@cox.net>
Date: Mon, 11 Jun 2007 02:54:07 +0200
Subject: Fix LayoutHints in the presence of nonzero border widths

darcs-hash:20070611005407-e3110-c5445ef9ad2a263be70e06b82208df53cac3e52d.gz
---
 LayoutHints.hs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'LayoutHints.hs')

diff --git a/LayoutHints.hs b/LayoutHints.hs
index 4c998fd..bcc38d9 100644
--- a/LayoutHints.hs
+++ b/LayoutHints.hs
@@ -3,11 +3,17 @@ module XMonadContrib.LayoutHints ( layoutHints ) where
 -- to use:
 -- defaultLayouts = [ layoutHints tiled, layoutHints $ mirror tiled , full ]
 
-import Operations ( applySizeHints )
+import Operations ( applySizeHints, D )
 import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Extras ( getWMNormalHints )
+import {-#SOURCE#-} Config (borderWidth)
 import XMonad hiding ( trace )
 
+-- | Expand a size by the given multiple of the border width.  The
+-- multiple is most commonly 1 or -1.
+adjBorders             :: Dimension -> D -> D
+adjBorders mult (w,h)  = (w+2*mult*borderWidth, h+2*mult*borderWidth)
+
 layoutHints :: Layout -> Layout
 layoutHints l = l { doLayout = \r x -> doLayout l r x >>= applyHints
                   , modifyLayout = \x -> fmap layoutHints `fmap` modifyLayout l x }
@@ -17,5 +23,5 @@ applyHints xs = mapM applyHint xs
     where applyHint (w,Rectangle a b c d) =
               withDisplay $ \disp ->
                   do sh <- io $ getWMNormalHints disp w
-                     let (c',d') = applySizeHints sh (c,d)
+                     let (c',d') = adjBorders 1 . applySizeHints sh . adjBorders (-1) $ (c,d)
                      return (w, Rectangle a b c' d')
-- 
cgit v1.2.3