twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-08-15 04:05:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix L.Mosaic bug where stored [Rational] was not extended

Browse Source
This commit is contained in:
Adam Vogt
2009-05-25 03:07:34 +00:00
parent 451ced82d9
commit f6479ee0a8
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
XMonad/Layout/Mosaic.hs
View File

@@ -118,10 +118,15 @@ instance LayoutClass Mosaic a where
rect = rects !! maybe (nls `div` 2) round (nextIx `fmap` state) rect = rects !! maybe (nls `div` 2) round (nextIx `fmap` state)
state' = fmap (\x@(ov,_,_) -> (ov,nextIx x,pred nls)) state state' = fmap (\x@(ov,_,_) -> (ov,nextIx x,pred nls)) state
`mplus` Just (True,fromIntegral nls / 2,pred nls) `mplus` Just (True,fromIntegral nls / 2,pred nls)
ss' | and $ zipWith (==) ss ssExt = ss ss' = maybe ss (const ss `either` const ssExt) $ zipRemain ss ssExt
| otherwise = ssExt
in return (zip (W.integrate st) rect, Just $ Mosaic state' delta ss') in return (zip (W.integrate st) rect, Just $ Mosaic state' delta ss')
zipRemain :: [a] -> [b] -> Maybe (Either [a] [b])
zipRemain (_:xs) (_:ys) = zipRemain xs ys
zipRemain [] [] = Nothing
zipRemain [] y = Just (Right y)
zipRemain x [] = Just (Left x)
-- | These sample functions are meant to be applied to the list of window sizes -- | These sample functions are meant to be applied to the list of window sizes
-- through the 'SlopeMod' message. -- through the 'SlopeMod' message.
changeMaster :: (Rational -> Rational) -> X () changeMaster :: (Rational -> Rational) -> X ()