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

X.L.MultiColumns bugfix and formating

Browse Source 
Fix bug where a column list of insufficient length could be used to find the column of the window. Also fix formating to conform better with standards.
This commit is contained in:
Anders Engstrom 2009-10-27 13:17:41 +00:00
parent 3fd77f5386
commit 6e84273e03
1 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
XMonad/Layout/MultiColumns.hs
View File

@ -83,7 +83,7 @@ instance LayoutClass MultiCol a where
-- Make sure the list of columns is big enough and update active column
nw = multiColNWin l ++ repeat (multiColDefWin l)
l' = l { multiColNWin = take (max (length $ multiColNWin l) $ getCol (wlen-1) nw + 1) nw
, multiColActive = getCol (length $ W.up s) (multiColNWin l)
, multiColActive = getCol (length $ W.up s) nw
}
-- Only return new layout if it has been modified
resl = if l'==l
@ -94,8 +94,7 @@ instance LayoutClass MultiCol a where
,fmap incmastern (fromMessage m)]
where resize Shrink = l { multiColSize = max (-0.5) $ s-ds }
resize Expand = l { multiColSize = min 1 $ s+ds }
incmastern (IncMasterN x)
= l { multiColNWin = take a n ++ [newval] ++ tail r }
incmastern (IncMasterN x) = l { multiColNWin = take a n ++ [newval] ++ tail r }
where newval = max 0 $ head r + x
r = drop a n
n = multiColNWin l
@ -105,7 +104,7 @@ instance LayoutClass MultiCol a where
description _ = "MultiCol"
-- Get which column a window is in.
-- | Get which column a window is in, starting at 0.
getCol :: Int -> [Int] -> Int
getCol w (n:ns) = if n<1 || w < n
then 0