From a2a6646a61a0cc8c9234a0464245c94ff51ac43f Mon Sep 17 00:00:00 2001 From: Adam Vogt Date: Sun, 5 Jul 2009 19:35:04 +0200 Subject: L.SubLayouts fix bug where previously run layouts would not get messages Ignore-this: 1d54ddb6596173f2fb6f30a648d7f3ba darcs-hash:20090705173504-1499c-f4c8bb7d90004d127196ecabea567cf4ebe27095.gz --- XMonad/Layout/SubLayouts.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'XMonad/Layout/SubLayouts.hs') diff --git a/XMonad/Layout/SubLayouts.hs b/XMonad/Layout/SubLayouts.hs index 6e6c47e..05f5af4 100644 --- a/XMonad/Layout/SubLayouts.hs +++ b/XMonad/Layout/SubLayouts.hs @@ -50,7 +50,7 @@ import Control.Monad(Monad(return), Functor(..), import Data.Function((.), ($), flip, id, on) import Data.List((++), foldr, filter, map, concatMap, elem, notElem, null, nubBy, (\\), find) -import Data.Maybe(Maybe(..), maybe, fromMaybe, listToMaybe, +import Data.Maybe(Maybe(..), isNothing, maybe, fromMaybe, listToMaybe, mapMaybe) import Data.Traversable(sequenceA) @@ -450,8 +450,8 @@ fromGroups' :: (Ord k) => a -> [a] -> Maybe (W.Stack k) -> Groups k -> [a] -> [(Bool,(a, W.Stack k))] fromGroups' defl defls st gs sls = [ (isNew,fromMaybe2 (dl, single w) (l, M.lookup w gs)) - | l <- map Just sls ++ repeat Nothing - | (isNew,dl) <- map ((,) False) defls ++ map ((,) True) (repeat defl) + | l <- map Just sls ++ repeat Nothing, let isNew = isNothing l + | dl <- defls ++ repeat defl | w <- W.integrate' $ W.filter (`notElem` unfocs) =<< st ] where unfocs = unfocused =<< M.elems gs single w = W.Stack w [] [] -- cgit v1.2.3