twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-05-19 03:20:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

X.A.DynamicWorkspaces: Remove duplicates when melding

Browse Source 
When removing a workspace and distributing its windows, it's important
to remove any duplicates that may be there due to, for example, usage of
X.A.CopyWindow.  X will only draw one of these window, leading to some
artifacts.

Related: https://github.com/xmonad/xmonad-contrib/issues/565

Co-authored-by: Tomas Janousek <tomi@nomi.cz>
This commit is contained in:
slotThe 2021-10-13 11:48:15 +02:00
parent f821a2ec0c
commit 929a6a3f6f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
XMonad/Actions/DynamicWorkspaces.hs
View File

@ -34,7 +34,7 @@ module XMonad.Actions.DynamicWorkspaces (
WorkspaceIndex WorkspaceIndex
) where ) where
import XMonad.Prelude (find, isNothing, when) import XMonad.Prelude (find, isNothing, nub, when)
import XMonad hiding (workspaces) import XMonad hiding (workspaces)
import XMonad.StackSet hiding (filter, modify, delete) import XMonad.StackSet hiding (filter, modify, delete)
import XMonad.Prompt.Workspace ( Wor(Wor), workspacePrompt ) import XMonad.Prompt.Workspace ( Wor(Wor), workspacePrompt )
@ -243,7 +243,7 @@ addHiddenWorkspace' add newtag l s@StackSet{ hidden = ws } = s { hidden = add (W
-- | Remove the hidden workspace with the given tag from the StackSet, if -- | Remove the hidden workspace with the given tag from the StackSet, if
-- it exists. All the windows in that workspace are moved to the current -- it exists. All the windows in that workspace are moved to the current
-- workspace. -- workspace.
removeWorkspace' :: (Eq i) => i -> StackSet i l a sid sd -> StackSet i l a sid sd removeWorkspace' :: (Eq i, Eq a) => i -> StackSet i l a sid sd -> StackSet i l a sid sd
removeWorkspace' torem s@StackSet{ current = scr@Screen { workspace = wc } removeWorkspace' torem s@StackSet{ current = scr@Screen { workspace = wc }
, hidden = hs } , hidden = hs }
= let (xs, ys) = break ((== torem) . tag) hs = let (xs, ys) = break ((== torem) . tag) hs
@ -251,7 +251,7 @@ removeWorkspace' torem s@StackSet{ current = scr@Screen { workspace = wc }
where meld Nothing Nothing = Nothing where meld Nothing Nothing = Nothing
meld x Nothing = x meld x Nothing = x
meld Nothing x = x meld Nothing x = x
meld (Just x) (Just y) = differentiate (integrate x ++ integrate y) meld (Just x) (Just y) = differentiate . nub $ integrate x ++ integrate y
removeWorkspace'' xs (y:ys) = s { current = scr { workspace = wc { stack = meld (stack y) (stack wc) } } removeWorkspace'' xs (y:ys) = s { current = scr { workspace = wc { stack = meld (stack y) (stack wc) } }
, hidden = xs ++ ys } , hidden = xs ++ ys }
removeWorkspace'' _ _ = s removeWorkspace'' _ _ = s