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

Fix bugs with nested drawers in X.L.Drawer

Browse Source 
There were two bugs:
1. The layout modifier assumed the rect's x was zero.
2. The layout modifier assumed that the stackset's focus actually had focus.
This commit is contained in:
Max Rabkin 2010-03-10 17:01:59 +00:00
parent 8cc604c4ad
commit ee38a0328b
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
XMonad/Layout/Drawer.hs
View File

@ -73,16 +73,17 @@ instance (LayoutClass l Window, Read (l Window)) => LayoutModifier (Drawer l) Wi
(upD, upM) <- partitionM (hasProperty p) up_ (upD, upM) <- partitionM (hasProperty p) up_
(downD, downM) <- partitionM (hasProperty p) down_ (downD, downM) <- partitionM (hasProperty p) down_
b <- hasProperty p w b <- hasProperty p w
focusedWindow <- gets (fmap S.focus . stack . workspace . current . windowset)
let (rectD, stackD, stackM) = if b let rectD = if b && Just w == focusedWindow then rectB else rectS
then ( rectB
, Just $ stk { up=upD, down=downD }
, mkStack upM downM )
else ( rectS
, mkStack upD downD
, Just $ stk { up=upM, down=downM } )
(winsD, _) <- runLayout (ws { layout=l , stack=stackD }) rectD let (stackD, stackM) = if b
then ( Just $ stk { up=upD, down=downD }
, mkStack upM downM )
else ( mkStack upD downD
, Just $ stk { up=upM, down=downM } )
(winsD, _) <- runLayout (ws { layout=l, stack=stackD }) rectD
(winsM, u') <- runLayout (ws { stack=stackM }) rectM (winsM, u') <- runLayout (ws { stack=stackM }) rectM
return (winsD ++ winsM, u') return (winsD ++ winsM, u')
where where
@ -91,7 +92,7 @@ instance (LayoutClass l Window, Read (l Window)) => LayoutModifier (Drawer l) Wi
mkStack (x:xs) ys = Just (Stack { up=xs, S.focus=x, down=ys }) mkStack (x:xs) ys = Just (Stack { up=xs, S.focus=x, down=ys })
rectB = rect { rect_width=round $ fromIntegral (rect_width rect) * rb } rectB = rect { rect_width=round $ fromIntegral (rect_width rect) * rb }
rectS = rectB { rect_x=round $ (rs - rb) * fromIntegral (rect_width rect) } rectS = rectB { rect_x=rect_x rectB - (round $ (rb - rs) * fromIntegral (rect_width rect)) }
rectM = rect { rect_x=rect_x rect + round (fromIntegral (rect_width rect) * rs) rectM = rect { rect_x=rect_x rect + round (fromIntegral (rect_width rect) * rs)
, rect_width=rect_width rect - round (fromIntegral (rect_width rect) * rs) } , rect_width=rect_width rect - round (fromIntegral (rect_width rect) * rs) }