aboutsummaryrefslogtreecommitdiffstats
path: root/XMonad/Actions
diff options
context:
space:
mode:
authorJoachim Breitner <mail@joachim-breitner.de>2008-10-06 23:10:27 +0200
committerJoachim Breitner <mail@joachim-breitner.de>2008-10-06 23:10:27 +0200
commit4e77ff374e4f20bc9872b2e1ce5e366c74ef83f5 (patch)
treee36870210fe7350073d5cac97ccd8cb4aa060d14 /XMonad/Actions
parent82fcc47ea367f2ba33f08f95320189a5bab87b41 (diff)
downloadXMonadContrib-4e77ff374e4f20bc9872b2e1ce5e366c74ef83f5.tar.gz
XMonadContrib-4e77ff374e4f20bc9872b2e1ce5e366c74ef83f5.tar.xz
XMonadContrib-4e77ff374e4f20bc9872b2e1ce5e366c74ef83f5.zip
Implement HiddenNonEmptyWS with HiddenWS and NonEmptyWS
(Just to reduce code duplication) darcs-hash:20081006211027-23c07-c89e895fb241d5c289348c3f35019edf9d56e380.gz
Diffstat (limited to 'XMonad/Actions')
-rw-r--r--XMonad/Actions/CycleWS.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/XMonad/Actions/CycleWS.hs b/XMonad/Actions/CycleWS.hs
index 4bb49cd..c0f19e2 100644
--- a/XMonad/Actions/CycleWS.hs
+++ b/XMonad/Actions/CycleWS.hs
@@ -185,8 +185,9 @@ wsTypeToPred EmptyWS = return (isNothing . stack)
wsTypeToPred NonEmptyWS = return (isJust . stack)
wsTypeToPred HiddenWS = do hs <- gets (map tag . hidden . windowset)
return (\w -> tag w `elem` hs)
-wsTypeToPred HiddenNonEmptyWS = do hs <- gets (map tag . hidden . windowset)
- return (\w -> isJust (stack w) && tag w `elem` hs)
+wsTypeToPred HiddenNonEmptyWS = do ne <- wsTypeToPred NonEmptyWS
+ hi <- wsTypeToPred HiddenWS
+ return (\w -> hi w && ne w)
wsTypeToPred AnyWS = return (const True)
wsTypeToPred (WSIs p) = p