aboutsummaryrefslogtreecommitdiffstats
path: root/Mosaic.hs
diff options
context:
space:
mode:
authorSpencer Janssen <sjanssen@cse.unl.edu>2007-06-11 20:34:39 +0200
committerSpencer Janssen <sjanssen@cse.unl.edu>2007-06-11 20:34:39 +0200
commitaa7b17533695687a9c31070f5d9845c52493856e (patch)
tree2045589e106c7bba57778278ebce9e7d5e8c8d8c /Mosaic.hs
parentbb778e7d5c38e5d68d350e11c61f0055000724c6 (diff)
downloadXMonadContrib-aa7b17533695687a9c31070f5d9845c52493856e.tar.gz
XMonadContrib-aa7b17533695687a9c31070f5d9845c52493856e.tar.xz
XMonadContrib-aa7b17533695687a9c31070f5d9845c52493856e.zip
Updates to work with recent API changes
darcs-hash:20070611183439-a5988-c3d6cc194fa83f012ab49d6d79130ff459dcdfe1.gz
Diffstat (limited to 'Mosaic.hs')
-rw-r--r--Mosaic.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Mosaic.hs b/Mosaic.hs
index 61d19ba..34e536e 100644
--- a/Mosaic.hs
+++ b/Mosaic.hs
@@ -31,6 +31,7 @@ import Data.Ratio
import Graphics.X11.Xlib
import XMonad hiding ( trace )
import Operations ( full, Resize(Shrink, Expand) )
+import qualified StackSet as W
import qualified Data.Map as M
import Data.List ( sort )
import Data.Typeable ( Typeable )
@@ -68,7 +69,7 @@ flexibility :: Double
flexibility = 0.1
mosaic :: Double -> Double -> M.Map NamedWindow [WindowHint] -> Layout
-mosaic delta tileFrac hints = full { doLayout = mosaicL tileFrac hints, modifyLayout = return . mlayout }
+mosaic delta tileFrac hints = full { doLayout = \r -> mosaicL tileFrac hints r . W.integrate, modifyLayout = return . mlayout }
where mlayout x = (m1 `fmap` fromMessage x) `mplus` (m2 `fmap` fromMessage x)
m1 Shrink = mosaic delta (tileFrac/(1+delta)) hints
m1 Expand = mosaic delta (tileFrac*(1+delta)) hints