Swapped pickSomething for <|> in doHybridNavigation.

This commit is contained in:
L.S. Leary
2016-08-30 13:11:54 +12:00
parent ea6e1a5d6d
commit 4358f58de8

View File

@@ -770,11 +770,9 @@ doCenterNavigation dir (cur, rect) winrects
-- | Implements Hybrid navigation. This attempts Line navigation first,
-- then falls back on Center navigation if it finds no suitable target window.
doHybridNavigation :: Eq a => Direction2D -> Rect a -> [Rect a] -> Maybe a
doHybridNavigation = applyToBoth pickSomething doLineNavigation doCenterNavigation
doHybridNavigation = applyToBoth (<|>) doLineNavigation doCenterNavigation
where
applyToBoth f g h a b c = f (g a b c) (h a b c)
pickSomething Nothing b = b
pickSomething a _ = a
-- | Swaps the current window with the window given as argument
swap :: Window -> WindowSet -> WindowSet