modifyLayout -> handleMessage.

This commit is contained in:
David Roundy
2007-09-25 18:29:30 +00:00
parent 8c6ebf9d6e
commit 23af4f228b
5 changed files with 7 additions and 7 deletions

View File

@@ -79,7 +79,7 @@ instance (Eq a, Show a, Read a, ReadableSomeLayout a, Layout l (SomeLayout a, In
, down = tail $ dropWhile (/=z) xs }
| otherwise = differentiate zs xs
differentiate [] xs = W.differentiate xs
modifyLayout (Combo f super origls) m =
handleMessage (Combo f super origls) m =
do mls <- broadcastPrivate m (map fst origls)
let mls' = (\x->zipWith first (map const x) origls) `fmap` mls
msuper <- broadcastPrivate m [super]
@@ -92,4 +92,4 @@ broadcastPrivate a ol = do nml <- mapM f ol
if any isJust nml
then return $ Just $ zipWith ((flip maybe) id) ol nml
else return Nothing
where f l = modifyLayout l a `catchX` return Nothing
where f l = handleMessage l a `catchX` return Nothing

View File

@@ -45,8 +45,8 @@ instance (LayoutModifier m a, Layout l a) => Layout (ModifiedLayout m l) a where
Just m' -> Just $ (ModifiedLayout m') $ maybe l id ml'
Nothing -> ModifiedLayout m `fmap` ml'
return (ws', ml'')
modifyLayout (ModifiedLayout m l) mess =
do ml' <- modifyLayout l mess
handleMessage (ModifiedLayout m l) mess =
do ml' <- handleMessage l mess
mm' <- modifyModify m mess
return $ case mm' of
Just m' -> Just $ (ModifiedLayout m') $ maybe l id ml'

View File

@@ -95,7 +95,7 @@ data Tabbed a =
instance Layout Tabbed Window where
doLayout (Tabbed mst conf) = doLay mst conf
modifyLayout l m = modLay l m
handleMessage l m = modLay l m
instance Read FontStruct where
readsPrec _ _ = []

View File

@@ -48,7 +48,7 @@ instance Layout ThreeCol a where
doLayout (ThreeCol nmaster _ frac) r =
return . (\x->(x,Nothing)) .
ap zip (tile3 frac r nmaster . length) . W.integrate
modifyLayout (ThreeCol nmaster delta frac) m =
handleMessage (ThreeCol nmaster delta frac) m =
return $ msum [fmap resize (fromMessage m)
,fmap incmastern (fromMessage m)]
where resize Shrink = ThreeCol nmaster delta (max 0 $ frac-delta)

View File

@@ -51,7 +51,7 @@ instance Layout TwoPane a where
[] -> [(focus st, rect)]
where (left, right) = splitHorizontallyBy split rect
modifyLayout (TwoPane delta split) x =
handleMessage (TwoPane delta split) x =
return $ case fromMessage x of
Just Shrink -> Just (TwoPane delta (split - delta))
Just Expand -> Just (TwoPane delta (split + delta))