Grid/HintedGrid: use an ncolumns formula inspired by dwm's "optimal" mode

darcs-hash:20080402012126-462cf-702c8178aefecd7feacc9fac0fe6774957acaf85.gz

2 files changed, 2 insertions, 5 deletions

diff --git a/XMonad/Layout/Grid.hs b/XMonad/Layout/Grid.hs
index 6dcd1bb..070bd2f 100644
--- a/XMonad/Layout/Grid.hs
+++ b/XMonad/Layout/Grid.hs
@@ -46,7 +46,7 @@ arrange :: Rectangle -> [a] -> [(a, Rectangle)]
 arrange (Rectangle rx ry rw rh) st = zip st rectangles
     where
     nwins = length st
-    ncols = ceiling . (sqrt :: Double -> Double) . fromIntegral $ nwins
+    ncols = max 1 . round . sqrt $ fromIntegral nwins * fromIntegral rw / (fromIntegral rh :: Double)
     mincs = nwins `div` ncols
     extrs = nwins - ncols * mincs
     chop :: Int -> Dimension -> [(Position, Dimension)]
diff --git a/XMonad/Layout/HintedGrid.hs b/XMonad/Layout/HintedGrid.hs
index 5b50204..2031520 100644
--- a/XMonad/Layout/HintedGrid.hs
+++ b/XMonad/Layout/HintedGrid.hs
@@ -56,9 +56,6 @@ instance LayoutClass Grid Window where
 adjBorders :: Dimension -> D -> D
 adjBorders b (w, h) = (w + 2 * b, h + 2 * b)
 
-isqrt :: (Integral a) => a -> a
-isqrt = ceiling . (sqrt :: Double -> Double) . fromIntegral
-
 replicateS :: Int -> (a -> (b, a)) -> a -> ([b], a)
 replicateS n = runState . replicateM n . State
 
@@ -110,7 +107,7 @@ arrange' :: D -> [D -> D] -> [Rectangle]
 arrange' (rw, rh) adjs = reverse $ doRect rh rw (fromIntegral ncolumns) (ecols ++ cols)
     where
     nwindows = length adjs
-    ncolumns = isqrt nwindows
+    ncolumns = max 1 . round . sqrt $ fromIntegral nwindows * fromIntegral rw / (fromIntegral rh :: Double)
     nrows = nwindows `div` ncolumns
     nextras = nwindows - ncolumns * nrows
     (ecols, adjs') = replicateS nextras (splitAt (nrows + 1)) $ reverse adjs