From 4e77ff374e4f20bc9872b2e1ce5e366c74ef83f5 Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Mon, 6 Oct 2008 23:10:27 +0200 Subject: Implement HiddenNonEmptyWS with HiddenWS and NonEmptyWS (Just to reduce code duplication) darcs-hash:20081006211027-23c07-c89e895fb241d5c289348c3f35019edf9d56e380.gz --- XMonad/Actions/CycleWS.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'XMonad/Actions/CycleWS.hs') 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 -- cgit v1.2.3