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

Revert "Merge pull request #350 from Thiago4532/opaque-window-border"

Browse Source 
This reverts commit dbe9c4f799fd826c199169d012c2d2687b210a7f, reversing
changes made to f6e4e278b54a8c37bfcd620debf4256cb59b875a.

A discussion of why, as well as a new way forward, in being discussed in

    https://github.com/xmonad/xmonad/issues/395

However, since we would like to release a new minor version soon-ish,
it's better to revert this for now.
This commit is contained in:
Tony Zorman 2022-06-18 17:40:25 +02:00
parent 0c8ed88d8a
commit e5a258f19c
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/XMonad/Operations.hs
View File

@ -258,7 +258,7 @@ setWindowBorderWithFallback :: Display -> Window -> String -> Pixel -> X ()
setWindowBorderWithFallback dpy w color basic = io $ setWindowBorderWithFallback dpy w color basic = io $
C.handle fallback $ do C.handle fallback $ do
wa <- getWindowAttributes dpy w wa <- getWindowAttributes dpy w
pixel <- setPixelSolid . color_pixel . fst <$> allocNamedColor dpy (wa_colormap wa) color pixel <- color_pixel . fst <$> allocNamedColor dpy (wa_colormap wa) color
setWindowBorder dpy w pixel setWindowBorder dpy w pixel
where where
fallback :: C.SomeException -> IO () fallback :: C.SomeException -> IO ()
@ -512,14 +512,10 @@ cleanMask km = do
nlm <- gets numberlockMask nlm <- gets numberlockMask
return (complement (nlm .|. lockMask) .&. km) return (complement (nlm .|. lockMask) .&. km)
-- | Set the 'Pixel' alpha value to 255.
setPixelSolid :: Pixel -> Pixel
setPixelSolid p = (p .|. 0xff000000)
-- | Get the 'Pixel' value for a named color. -- | Get the 'Pixel' value for a named color.
initColor :: Display -> String -> IO (Maybe Pixel) initColor :: Display -> String -> IO (Maybe Pixel)
initColor dpy c = C.handle (\(C.SomeException _) -> return Nothing) $ initColor dpy c = C.handle (\(C.SomeException _) -> return Nothing) $
(Just . setPixelSolid . color_pixel . fst) <$> allocNamedColor dpy colormap c (Just . color_pixel . fst) <$> allocNamedColor dpy colormap c
where colormap = defaultColormap dpy (defaultScreen dpy) where colormap = defaultColormap dpy (defaultScreen dpy)
------------------------------------------------------------------------ ------------------------------------------------------------------------