twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-05-19 03:20:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove 'descriptions' stuff from NewSelect. I think we can do this without make LayoutClass larger

Browse Source
This commit is contained in:
Spencer Janssen 2007-11-01 03:38:44 +00:00
parent 1a67657db8
commit d64e43e858
1 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
LayoutCombinators.hs
View File

@ -58,7 +58,6 @@ instance (LayoutClass l1 a, LayoutClass l2 a) => LayoutClass (NewSelect l1 l2) a
return (wrs, (\l2' -> NewSelect False l1 l2') `fmap` ml2')
description (NewSelect True l1 _) = description l1
description (NewSelect False _ l2) = description l2
descriptions (NewSelect _ l1 l2) = descriptions l1 ++ descriptions l2
handleMessage (NewSelect False l1 l2) m
| Just Wrap <- fromMessage m =
do ml2' <- handleMessage l2 (SomeMessage Hide)
@ -82,26 +81,6 @@ instance (LayoutClass l1 a, LayoutClass l2 a) => LayoutClass (NewSelect l1 l2) a
Nothing -> do ml2' <- handleMessage l2 (SomeMessage Hide)
ml1' <- handleMessage l1 (SomeMessage Wrap)
return $ Just $ NewSelect True (maybe l1 id ml1') (maybe l2 id ml2')
handleMessage (NewSelect True l1 l2) m
| Just (JumpToLayout d) <- fromMessage m =
if d `elem` descriptions l2
then do ml1' <- handleMessage l1 (SomeMessage Hide)
ml2' <- handleMessage l2 m
return $ Just $ NewSelect False (maybe l1 id ml1') (maybe l2 id ml2')
else if d `elem` descriptions l1
then do ml1' <- handleMessage l1 m
return $ (\l1' -> NewSelect True l1' l2) `fmap` ml1'
else return Nothing
handleMessage (NewSelect False l1 l2) m
| Just (JumpToLayout d) <- fromMessage m =
if d `elem` descriptions l1
then do ml2' <- handleMessage l2 (SomeMessage Hide)
ml1' <- handleMessage l1 m
return $ Just $ NewSelect False (maybe l1 id ml1') (maybe l2 id ml2')
else if d `elem` descriptions l2
then do ml2' <- handleMessage l2 m
return $ (\l2' -> NewSelect True l1 l2') `fmap` ml2'
else return Nothing
handleMessage (NewSelect b l1 l2) m
| Just ReleaseResources <- fromMessage m =
do ml1' <- handleMessage l1 m