Updates for Layout API change

This commit is contained in:
Spencer Janssen
2007-06-10 20:38:40 +00:00
parent 2d4e0b6e94
commit 5a54e27a76
3 changed files with 3 additions and 3 deletions

View File

@@ -5,7 +5,7 @@ import XMonad
circle :: Layout circle :: Layout
circle = Layout { doLayout = circleLayout, circle = Layout { doLayout = circleLayout,
modifyLayout = const Nothing } modifyLayout = return . const Nothing }
circleLayout :: Rectangle -> [Window] -> X [(Window, Rectangle)] circleLayout :: Rectangle -> [Window] -> X [(Window, Rectangle)]
circleLayout _ [] = return [] circleLayout _ [] = return []

View File

@@ -33,7 +33,7 @@ blend scale ratios = zipWith (+) ratios scaleFactors
spiral :: Rational -> Layout spiral :: Rational -> Layout
spiral scale = Layout { doLayout = fibLayout, spiral scale = Layout { doLayout = fibLayout,
modifyLayout = \m -> fmap resize $ fromMessage m } modifyLayout = \m -> return $ fmap resize $ fromMessage m }
where where
fibLayout sc ws = return $ zip ws rects fibLayout sc ws = return $ zip ws rects
where ratios = blend scale . reverse . take (length ws - 1) . mkRatios $ tail fibs where ratios = blend scale . reverse . take (length ws - 1) . mkRatios $ tail fibs

View File

@@ -24,7 +24,7 @@ twoPane delta split = Layout { doLayout = arrange, modifyLayout = message }
-- there are one or zero windows -- there are one or zero windows
arrange rect ws = return . map (\w -> (w, rect)) $ ws arrange rect ws = return . map (\w -> (w, rect)) $ ws
message x = case fromMessage x of message x = return $ case fromMessage x of
Just Shrink -> Just (twoPane delta (split - delta)) Just Shrink -> Just (twoPane delta (split - delta))
Just Expand -> Just (twoPane delta (split + delta)) Just Expand -> Just (twoPane delta (split + delta))
_ -> Nothing _ -> Nothing