diff options
| author | Joachim Breitner <mail@joachim-breitner.de> | 2008-10-05 21:02:20 +0200 |
|---|---|---|
| committer | Joachim Breitner <mail@joachim-breitner.de> | 2008-10-05 21:02:20 +0200 |
| commit | 1e67a3f13c5ff800ebc6756deee22abb2e4fc6ba (patch) | |
| tree | 7ba95eb3e9c225ee33881d42cd58c2b3ba7b4247 /XMonad/Layout/WindowNavigation.hs | |
| parent | 72778301857e5ba4e34cbb2bc822612beefb36f2 (diff) | |
| download | XMonadContrib-1e67a3f13c5ff800ebc6756deee22abb2e4fc6ba.tar.gz XMonadContrib-1e67a3f13c5ff800ebc6756deee22abb2e4fc6ba.tar.xz XMonadContrib-1e67a3f13c5ff800ebc6756deee22abb2e4fc6ba.zip | |
Merge emptyLayoutMod into redoLayout
This removes the emptyLayoutMod method from the LayoutModifier class, and
change the Stack parameter to redoLayout to a Maybe Stack one. It also changes
all affected code. This should should be a refactoring without any change in
program behaviour.
darcs-hash:20081005190220-23c07-4701517e3433ecff8c999da75ac582f6f1b65c19.gz
Diffstat (limited to 'XMonad/Layout/WindowNavigation.hs')
| -rw-r--r-- | XMonad/Layout/WindowNavigation.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/XMonad/Layout/WindowNavigation.hs b/XMonad/Layout/WindowNavigation.hs index e314f16..949c60f 100644 --- a/XMonad/Layout/WindowNavigation.hs +++ b/XMonad/Layout/WindowNavigation.hs @@ -106,7 +106,7 @@ configurableNavigation :: LayoutClass l a => WNConfig -> l a -> ModifiedLayout W configurableNavigation conf = ModifiedLayout (WindowNavigation conf (I Nothing)) instance LayoutModifier WindowNavigation Window where - redoLayout (WindowNavigation conf (I state)) rscr s origwrs = + redoLayout (WindowNavigation conf (I state)) rscr (Just s) origwrs = do XConf { normalBorder = nbc, focusedBorder = fbc, display = dpy } <- ask [uc,dc,lc,rc] <- case brightness conf of @@ -136,6 +136,7 @@ instance LayoutModifier WindowNavigation Window where mapM_ (sc nbc) (wothers \\ map fst wnavigable) mapM_ (\(win,c) -> sc c win) wnavigablec return (origwrs, Just $ WindowNavigation conf $ I $ Just $ NS pt wnavigable) + redoLayout _ _ _ origwrs = return (origwrs, Nothing) handleMessOrMaybeModifyIt (WindowNavigation conf (I (Just (NS pt wrs)))) m | Just (Go d) <- fromMessage m = |