twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-08-01 04:31:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #418 from liskin/trackfloating-focustracking

Browse Source 
X.L.TrackFloating: Clean up and simplify
This commit is contained in:
Tomáš Janoušek
2021-01-30 12:53:09 +01:00
committed by GitHub
parent c3c0d38b26 89dbdd4767
commit 2eb67ed341
3 changed files with 25 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
XMonad/Util/Stack.hs
View File

@@ -182,7 +182,7 @@ focusMasterZ (Just s) = Just s
-- | Refocus a @Stack a@ on an element satisfying the predicate, or fail to
-- @Nothing@.
findS :: Eq a => (a -> Bool) -> W.Stack a -> Maybe (W.Stack a)
findS :: (a -> Bool) -> W.Stack a -> Maybe (W.Stack a)
findS p st = st <$ (guard . p . W.focus) st <|> findUp st <|> findDown st
where findDown = reverseZ . findUp . reverseS
findUp s | u:ups <- W.up s = (if p u then Just else findUp)
@@ -190,11 +190,10 @@ findS p st = st <$ (guard . p . W.focus) st <|> findUp st <|> findDown st
| otherwise = Nothing
-- | Refocus a @Zipper a@ on an element satisfying the predicate, or fail to
-- @Nothing@. Never returns @Just Nothing@, so the second layer of @Maybe@ is
-- actually redundant.
findZ :: Eq a => (a -> Bool) -> Zipper a -> Maybe (Zipper a)
-- @Nothing@.
findZ :: (a -> Bool) -> Zipper a -> Zipper a
findZ _ Nothing = Nothing
findZ p (Just st) = Just <$> findS p st
findZ p (Just st) = findS p st
-- ** Extraction