mirror of
https://github.com/xmonad/xmonad-contrib.git
synced 2025-08-09 00:11:52 -07:00
Fix LayoutHints in the presence of nonzero border widths
This commit is contained in:
@@ -3,11 +3,17 @@ module XMonadContrib.LayoutHints ( layoutHints ) where
|
|||||||
-- to use:
|
-- to use:
|
||||||
-- defaultLayouts = [ layoutHints tiled, layoutHints $ mirror tiled , full ]
|
-- defaultLayouts = [ layoutHints tiled, layoutHints $ mirror tiled , full ]
|
||||||
|
|
||||||
import Operations ( applySizeHints )
|
import Operations ( applySizeHints, D )
|
||||||
import Graphics.X11.Xlib
|
import Graphics.X11.Xlib
|
||||||
import Graphics.X11.Xlib.Extras ( getWMNormalHints )
|
import Graphics.X11.Xlib.Extras ( getWMNormalHints )
|
||||||
|
import {-#SOURCE#-} Config (borderWidth)
|
||||||
import XMonad hiding ( trace )
|
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 :: Layout -> Layout
|
||||||
layoutHints l = l { doLayout = \r x -> doLayout l r x >>= applyHints
|
layoutHints l = l { doLayout = \r x -> doLayout l r x >>= applyHints
|
||||||
, modifyLayout = \x -> fmap layoutHints `fmap` modifyLayout l x }
|
, 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) =
|
where applyHint (w,Rectangle a b c d) =
|
||||||
withDisplay $ \disp ->
|
withDisplay $ \disp ->
|
||||||
do sh <- io $ getWMNormalHints disp w
|
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')
|
return (w, Rectangle a b c' d')
|
||||||
|
Reference in New Issue
Block a user