ElKowar/dots-of-war
1
0
Fork 0
mirror of https://github.com/elkowar/dots-of-war.git synced 2024-11-06 11:22:23 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity

Fix bar display when dragging window decorations are visible

Browse source
This commit is contained in:
Leon Kowarschick 2020-05-25 21:04:58 +02:00
parent 96d84615dc
commit d2e71df8db
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
files/.xmonad/lib/Config.hs
View file

@ -7,6 +7,7 @@ module Config (main) where
import Control.Concurrent import Control.Concurrent
import Control.Exception ( catch , SomeException) import Control.Exception ( catch , SomeException)
import Control.Monad ( filterM ) import Control.Monad ( filterM )
import Control.Arrow ( (>>>) )
import Data.List ( isPrefixOf , isSuffixOf) import Data.List ( isPrefixOf , isSuffixOf)
import System.Exit (exitSuccess) import System.Exit (exitSuccess)
@ -125,18 +126,26 @@ aqua = "#8ec07c"
-- Layout ---------------------------------------- {{{ -- Layout ---------------------------------------- {{{
myTabTheme = defaultThemeWithButtons myTabTheme = def -- defaultThemeWithButtons
{ activeColor = "#282828" { -- activeColor = "#8ec07c"
activeColor = "#1d2021"
--activeColor = "#1d2021"
--activeColor = "#504945" --activeColor = "#504945"
--, inactiveColor = "#282828" --, inactiveColor = "#282828"
, inactiveColor = "#1d2021" , inactiveColor = "#1d2021"
, activeBorderColor = "#282828" , activeBorderColor = "#1d2021"
, inactiveBorderColor = "#282828" , inactiveBorderColor = "#282828"
, activeTextColor = "#fbf1c7" , activeTextColor = "#fbf1c7"
, inactiveTextColor = "#fbf1c7" , inactiveTextColor = "#fbf1c7"
, decoHeight = 15
, fontName = "-misc-cozettevector-*-*-*-*-10-*-*-*-*-*-*-*" , fontName = "-misc-cozettevector-*-*-*-*-10-*-*-*-*-*-*-*"
--, fontName = "-misc-scientifica-*-*-*-*-10-*-*-*-*-*-*-*"
} }
data EmptyShrinker = EmptyShrinker deriving (Show, Read)
instance Shrinker EmptyShrinker where
shrinkIt _ _ = [] :: [String]
myLayout = avoidStruts myLayout = avoidStruts
$ smartBorders $ smartBorders
$ MTog.mkToggle1 MTog.FULL $ MTog.mkToggle1 MTog.FULL
@ -172,12 +181,12 @@ myLayout = avoidStruts
-- | transform a layout into supporting tabs -- | transform a layout into supporting tabs
makeTabbed layout = BoringWindows.boringWindows . windowNavigation . addTabs shrinkText myTabTheme $ subLayout [] Simplest $ layout makeTabbed layout = BoringWindows.boringWindows . windowNavigation . addTabs shrinkText myTabTheme $ subLayout [] Simplest $ layout
data WINDOWDECORATION = WINDOWDECORATION deriving (Read, Show, Eq, Typeable) data WINDOWDECORATION = WINDOWDECORATION deriving (Read, Show, Eq, Typeable)
instance MTog.Transformer WINDOWDECORATION Window where instance MTog.Transformer WINDOWDECORATION Window where
transform WINDOWDECORATION x k = k transform WINDOWDECORATION x k = k
(windowSwitcherDecorationWithButtons shrinkText myTabTheme $ draggingVisualizer $ x) (windowSwitcherDecoration shrinkText myTabTheme $ draggingVisualizer $ x)
(const x) (const x)
--(\(ModifiedLayout _ x') -> x')
-- }}} -- }}}
@ -453,8 +462,9 @@ polybarPP monitor = namedScratchpadFilterOutWorkspacePP . (if useSharedWorkspace
, ppHiddenNoWindows = withFG gray . withMargin . withFont 5 . (`wrapClickableWorkspace` "__empty__") , ppHiddenNoWindows = withFG gray . withMargin . withFont 5 . (`wrapClickableWorkspace` "__empty__")
, ppWsSep = "" , ppWsSep = ""
, ppSep = "" , ppSep = ""
, ppLayout = \l -> if l == "Tall" || l == "Horizon" then "" , ppLayout = removeWords ["DraggingVisualizer", "WindowSwitcherDeco", "Minimize", "Hinted", "Spacing", "Tall"]
else (withFG gray " | ") ++ (removeWords ["Minimize", "Hinted", "Spacing", "Tall"] . withFG purple . withMargin $ l) >>> \l -> if l == "Tall" || l == "Horizon" || l == "" then ""
else (withFG gray " | ") ++ (withFG purple $ withMargin l)
, ppExtras = [] , ppExtras = []
, ppTitle = const "" -- withFG aqua . (shorten 40) , ppTitle = const "" -- withFG aqua . (shorten 40)
, ppSort = if useSharedWorkspaces then getSortByXineramaPhysicalRule horizontalScreenOrderer , ppSort = if useSharedWorkspaces then getSortByXineramaPhysicalRule horizontalScreenOrderer