aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrent Yorgey <byorgey@gmail.com>2008-03-11 19:14:00 +0100
committerBrent Yorgey <byorgey@gmail.com>2008-03-11 19:14:00 +0100
commit4b71b208e6e31f9ab177cda9391a882766b39eff (patch)
tree191be8b1670cb6871cd0670822abc604942b7675
parent0b106ffba0bfff3c79ab73dbf2e00072caa2106e (diff)
downloadXMonadContrib-4b71b208e6e31f9ab177cda9391a882766b39eff.tar.gz
XMonadContrib-4b71b208e6e31f9ab177cda9391a882766b39eff.tar.xz
XMonadContrib-4b71b208e6e31f9ab177cda9391a882766b39eff.zip
Combo: update to work with runLayout changes
darcs-hash:20080311181400-bd4d7-9d4053b49d868eb3ae07e6e9ac067dab36ec270b.gz
-rw-r--r--XMonad/Layout/Combo.hs14
1 files changed, 7 insertions, 7 deletions
diff --git a/XMonad/Layout/Combo.hs b/XMonad/Layout/Combo.hs
index 41cc5fc..9f2c671 100644
--- a/XMonad/Layout/Combo.hs
+++ b/XMonad/Layout/Combo.hs
@@ -6,7 +6,7 @@
-- Module : XMonad.Layout.Combo
-- Copyright : (c) David Roundy <droundy@darcs.net>
-- License : BSD-style (see LICENSE)
---
+--
-- Maintainer : David Roundy <droundy@darcs.net>
-- Stability : unstable
-- Portability : unportable
@@ -17,7 +17,7 @@
module XMonad.Layout.Combo (
-- * Usage
- -- $usage
+ -- $usage
combineTwo,
CombineTwo
) where
@@ -31,11 +31,11 @@ import qualified XMonad.StackSet as W ( differentiate )
-- $usage
-- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@:
---
--- > import XMonad.Layout.Combo
---
+--
+-- > import XMonad.Layout.Combo
+--
-- and add something like
---
+--
-- > combineTwo (TwoPane 0.03 0.5) (tabbed shrinkText defaultTConf) (tabbed shrinkText defaultTConf)
--
-- to your layouts.
@@ -99,7 +99,7 @@ instance (LayoutClass l (), LayoutClass l1 a, LayoutClass l2 a, Read a, Show a,
s1 = differentiate f' (origws \\ w2')
s2 = differentiate f' w2'
f' = focus s:delete (focus s) f
- ([((),r1),((),r2)], msuper') <- doLayout super rinput superstack
+ ([((),r1),((),r2)], msuper') <- runLayout (Workspace "" super (Just superstack)) rinput
(wrs1, ml1') <- runLayout (Workspace "" l1 s1) r1
(wrs2, ml2') <- runLayout (Workspace "" l2 s2) r2
return (wrs1++wrs2, Just $ C2 f' w2'