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

X.L.MultiCol constructor 0 NWin bugfig

Browse Source 
Fix bug where the constructor did not accept catch-all columns. Also some minor cleaning.
This commit is contained in:
Anders Engstrom 2009-10-29 10:56:33 +00:00
parent ccd71d4a15
commit b1ac0b5030
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
XMonad/Layout/MultiColumns.hs
View File

@ -58,14 +58,14 @@ import Control.Monad
-- --
-- "XMonad.Doc.Extending#Editing_the_layout_hook" -- "XMonad.Doc.Extending#Editing_the_layout_hook"
-- | Layout creator. -- | Layout constructor.
multiCol multiCol
:: [Int] -- ^ Windows in each column, starting with master. Set to 0 to catch the rest. :: [Int] -- ^ Windows in each column, starting with master. Set to 0 to catch the rest.
-> Int -- ^ Default value for all following columns. -> Int -- ^ Default value for all following columns.
-> Rational -- ^ How much to change size each time. -> Rational -- ^ How much to change size each time.
-> Rational -- ^ Initial size of master area, or column area if the size is negative. -> Rational -- ^ Initial size of master area, or column area if the size is negative.
-> MultiCol a -> MultiCol a
multiCol n defn ds s = MultiCol (map (max 1) n) (max 1 defn) ds s 0 multiCol n defn ds s = MultiCol (map (max 0) n) (max 0 defn) ds s 0
data MultiCol a = MultiCol data MultiCol a = MultiCol
{ multiColNWin :: ![Int] { multiColNWin :: ![Int]
@ -115,8 +115,9 @@ getCol _ _ = -1
doL :: [Int] -> Rational -> Rectangle -> Int -> [Rectangle] doL :: [Int] -> Rational -> Rectangle -> Int -> [Rectangle]
doL nwin s r n = rlist doL nwin s r n = rlist
where -- Number of columns to tile where -- Number of columns to tile
size = floor $ abs s * fromIntegral (rect_width r)
ncol = getCol (n-1) nwin + 1 ncol = getCol (n-1) nwin + 1
-- Compute the actual size
size = floor $ abs s * fromIntegral (rect_width r)
-- Extract all but last column to tile -- Extract all but last column to tile
c = take (ncol-1) nwin c = take (ncol-1) nwin
-- Compute number of windows in last column and add it to the others -- Compute number of windows in last column and add it to the others
@ -124,7 +125,9 @@ doL nwin s r n = rlist
-- Compute width of columns -- Compute width of columns
width = if s>0 width = if s>0
then if ncol==1 then if ncol==1
-- Only one window
then [fromIntegral $ rect_width r] then [fromIntegral $ rect_width r]
-- Give the master it's space and split the rest equally for the other columns
else size:replicate (ncol-1) ((fromIntegral (rect_width r) - size) `div` (ncol-1)) else size:replicate (ncol-1) ((fromIntegral (rect_width r) - size) `div` (ncol-1))
else if fromIntegral ncol * abs s >= 1 else if fromIntegral ncol * abs s >= 1
-- Split equally -- Split equally