twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-08-25 16:43:47 -07:00
Code Issues Packages Projects Releases Wiki Activity

ResizableTile.hs: fix resizing to work in the presence of floating windows (resolves issue #100)

Browse Source
This commit is contained in:
Brent Yorgey
2007-12-25 13:58:39 +00:00
parent c698a58fe6
commit 24b112c452
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
XMonad/Layout/ResizableTile.hs
View File

@@ -24,6 +24,8 @@ module XMonad.Layout.ResizableTile (
import XMonad hiding (splitVertically, splitHorizontallyBy) import XMonad hiding (splitVertically, splitHorizontallyBy)
import qualified XMonad.StackSet as W import qualified XMonad.StackSet as W
import Control.Monad import Control.Monad
import qualified Data.Map as M
import Data.List ((\\))
-- $usage -- $usage
-- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@: -- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@:
@@ -58,12 +60,16 @@ instance LayoutClass ResizableTall a where
ap zip (tile frac (mfrac ++ repeat 1) r nmaster . length) . W.integrate ap zip (tile frac (mfrac ++ repeat 1) r nmaster . length) . W.integrate
handleMessage (ResizableTall nmaster delta frac mfrac) m = handleMessage (ResizableTall nmaster delta frac mfrac) m =
do ms <- (W.stack . W.workspace . W.current) `fmap` gets windowset do ms <- (W.stack . W.workspace . W.current) `fmap` gets windowset
case ms of fs <- (M.keys . W.floating) `fmap` gets windowset
Nothing -> return Nothing return $ ms >>= unfloat fs >>= handleMesg
Just s -> return $ msum [fmap resize (fromMessage m) where handleMesg s = msum [fmap resize (fromMessage m)
,fmap (\x -> mresize x s) (fromMessage m) ,fmap (\x -> mresize x s) (fromMessage m)
,fmap incmastern (fromMessage m)] ,fmap incmastern (fromMessage m)]
where resize Shrink = ResizableTall nmaster delta (max 0 $ frac-delta) mfrac unfloat fs s = if W.focus s `elem` fs
then Nothing
else Just (s { W.up = (W.up s) \\ fs
, W.down = (W.down s) \\ fs })
resize Shrink = ResizableTall nmaster delta (max 0 $ frac-delta) mfrac
resize Expand = ResizableTall nmaster delta (min 1 $ frac+delta) mfrac resize Expand = ResizableTall nmaster delta (min 1 $ frac+delta) mfrac
mresize MirrorShrink s = mresize' s delta mresize MirrorShrink s = mresize' s delta
mresize MirrorExpand s = mresize' s (0-delta) mresize MirrorExpand s = mresize' s (0-delta)