twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-05-19 11:30:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Combo: update to work with runLayout changes

Browse Source
This commit is contained in:
Brent Yorgey 2008-03-11 18:14:00 +00:00
parent 5769b3343b
commit a0daaf1e47
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
XMonad/Layout/Combo.hs
View File

@ -6,7 +6,7 @@
-- Module : XMonad.Layout.Combo -- Module : XMonad.Layout.Combo
-- Copyright : (c) David Roundy <droundy@darcs.net> -- Copyright : (c) David Roundy <droundy@darcs.net>
-- License : BSD-style (see LICENSE) -- License : BSD-style (see LICENSE)
-- --
-- Maintainer : David Roundy <droundy@darcs.net> -- Maintainer : David Roundy <droundy@darcs.net>
-- Stability : unstable -- Stability : unstable
-- Portability : unportable -- Portability : unportable
@ -17,7 +17,7 @@
module XMonad.Layout.Combo ( module XMonad.Layout.Combo (
-- * Usage -- * Usage
-- $usage -- $usage
combineTwo, combineTwo,
CombineTwo CombineTwo
) where ) where
@ -31,11 +31,11 @@ import qualified XMonad.StackSet as W ( differentiate )
-- $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@:
-- --
-- > import XMonad.Layout.Combo -- > import XMonad.Layout.Combo
-- --
-- and add something like -- and add something like
-- --
-- > combineTwo (TwoPane 0.03 0.5) (tabbed shrinkText defaultTConf) (tabbed shrinkText defaultTConf) -- > combineTwo (TwoPane 0.03 0.5) (tabbed shrinkText defaultTConf) (tabbed shrinkText defaultTConf)
-- --
-- to your layouts. -- 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') s1 = differentiate f' (origws \\ w2')
s2 = differentiate f' w2' s2 = differentiate f' w2'
f' = focus s:delete (focus s) f 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 (wrs1, ml1') <- runLayout (Workspace "" l1 s1) r1
(wrs2, ml2') <- runLayout (Workspace "" l2 s2) r2 (wrs2, ml2') <- runLayout (Workspace "" l2 s2) r2
return (wrs1++wrs2, Just $ C2 f' w2' return (wrs1++wrs2, Just $ C2 f' w2'