diff options
| author | Adam Vogt <vogt.adam@gmail.com> | 2009-07-05 19:51:45 +0200 |
|---|---|---|
| committer | Adam Vogt <vogt.adam@gmail.com> | 2009-07-05 19:51:45 +0200 |
| commit | cc2ee817cbb4ca1df6e2e8363da69f9d91189092 (patch) | |
| tree | 25ff447235db40a36fdf4d171aa576e909e33e40 | |
| parent | a04b53d423f2b16aa253be957213bb2c700594ee (diff) | |
| download | XMonadContrib-cc2ee817cbb4ca1df6e2e8363da69f9d91189092.tar.gz XMonadContrib-cc2ee817cbb4ca1df6e2e8363da69f9d91189092.tar.xz XMonadContrib-cc2ee817cbb4ca1df6e2e8363da69f9d91189092.zip | |
Reduce a bit of recently introduced duplication in L.SubLayouts
Ignore-this: e87a5643938183eff156e08646cc71ac
darcs-hash:20090705175145-1499c-2c3ffac4ccbec1b5b6d0101e8a0aa714898b5547.gz
| -rw-r--r-- | XMonad/Layout/SubLayouts.hs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/XMonad/Layout/SubLayouts.hs b/XMonad/Layout/SubLayouts.hs index 2cd2a8a..141e2ab 100644 --- a/XMonad/Layout/SubLayouts.hs +++ b/XMonad/Layout/SubLayouts.hs @@ -352,12 +352,10 @@ instance (Read (l Window), Show (l Window), LayoutClass l Window) => LayoutModif in fgs $ M.unions $ map mkSingleton ws | Just (Merge x y) <- fromMessage m - , let findGrp z = mplus (M.lookup z gs) $ listToMaybe - $ M.elems $ M.filter ((z `elem`) . W.integrate) gs - , Just (W.Stack _ xb xn) <- findGrp x - , Just yst <- findGrp y = + , Just (W.Stack _ xb xn) <- findGroup x + , Just yst <- findGroup y = let zs = W.Stack x xb (xn ++ W.integrate yst) - in fgs $ M.update (\_ -> Just zs) x $ M.delete y gs + in fgs $ M.insert x zs $ M.delete (W.focus yst) gs | Just (UnMerge x) <- fromMessage m = fgs . M.fromList . map (W.focus &&& id) . M.elems |