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.TreeSelect: Fix swapped green/blue in foreground when using Xft

Browse Source 
Closes: https://github.com/xmonad/xmonad-contrib/pull/486
Co-authored-by: Joan Milev <joantmilev@gmail.com>
This commit is contained in:
Tomas Janousek 2021-03-22 15:25:53 +00:00
parent bebcb605a8
commit 46f24bb27e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.md
View File

@ -169,6 +169,10 @@
### Bug Fixes and Minor Changes ### Bug Fixes and Minor Changes
* `XMonad.Actions.TreeSelect`
- Fix swapped green/blue in foreground when using Xft.
* `XMonad.Layout.Fullscreen` * `XMonad.Layout.Fullscreen`
- Add fullscreenSupportBorder which uses smartBorders to remove - Add fullscreenSupportBorder which uses smartBorders to remove

8
XMonad/Actions/TreeSelect.hs
View File

@ -161,8 +161,8 @@ import Graphics.X11.Xrender
-- white = 0xffffffff -- white = 0xffffffff
-- black = 0xff000000 -- black = 0xff000000
-- red = 0xffff0000 -- red = 0xffff0000
-- blue = 0xff00ff00 -- green = 0xff00ff00
-- green = 0xff0000ff -- blue = 0xff0000ff
-- transparent = 0x00000000 -- transparent = 0x00000000
-- @ -- @
@ -656,7 +656,7 @@ drawStringXMF display window visual colormap gc font col x y text = case font of
-- Note that it uses short to represent its components -- Note that it uses short to represent its components
fromARGB :: Pixel -> XRenderColor fromARGB :: Pixel -> XRenderColor
fromARGB x = XRenderColor (fromIntegral $ 0xff00 .&. shiftR x 8) -- red fromARGB x = XRenderColor (fromIntegral $ 0xff00 .&. shiftR x 8) -- red
(fromIntegral $ 0xff00 .&. x) -- green (fromIntegral $ 0xff00 .&. shiftL x 8) -- blue (swapped with green as a workaround for the
(fromIntegral $ 0xff00 .&. shiftL x 8) -- blue (fromIntegral $ 0xff00 .&. x) -- green faulty Storable instance in X11-xft <= 0.3.1)
(fromIntegral $ 0xff00 .&. shiftR x 16) -- alpha (fromIntegral $ 0xff00 .&. shiftR x 16) -- alpha
#endif #endif