diff options
| -rw-r--r-- | XMonad/Util/WorkspaceCompare.hs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/XMonad/Util/WorkspaceCompare.hs b/XMonad/Util/WorkspaceCompare.hs index 66e401e..88886f5 100644 --- a/XMonad/Util/WorkspaceCompare.hs +++ b/XMonad/Util/WorkspaceCompare.hs @@ -40,12 +40,20 @@ getWsIndex = do spaces <- asks (workspaces . config) return $ flip elemIndex spaces +-- | Compare Maybe's differently, so Nothing (i.e. workspaces without indexes) +-- come last in the order +indexCompare :: Maybe Int -> Maybe Int -> Ordering +indexCompare Nothing Nothing = EQ +indexCompare Nothing (Just _) = GT +indexCompare (Just _) Nothing = LT +indexCompare a b = compare a b + -- | A comparison function for WorkspaceId, based on the index of the -- tags in the user's config. getWsCompare :: X WorkspaceCompare getWsCompare = do wsIndex <- getWsIndex - return $ mconcat [compare `on` wsIndex, compare] + return $ mconcat [indexCompare `on` wsIndex, compare] -- | A simple comparison function that orders workspaces -- lexicographically by tag. |