pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(tray): remove tray-transparent option

Browse Source 
This option is no longer necessary because the tray background color can now
simply be set to any (semi-)transparent color (just like the bar background).
This commit is contained in:
Benno Fünfstück 2018-07-05 21:03:48 +02:00 committed by Patrick Ziegler
parent 66cf9b8b99
commit 59c0ccef50
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/config.cmake
View File

@ -61,7 +61,6 @@ modules-right = @MODULES_RIGHT@
tray-position = right tray-position = right
tray-padding = 2 tray-padding = 2
;tray-transparent = true
;tray-background = #0063ff ;tray-background = #0063ff
;wm-restack = bspwm ;wm-restack = bspwm

27
src/x11/tray_manager.cpp
View File

@ -121,23 +121,16 @@ void tray_manager::setup(const bar_settings& bar_opts) {
} }
// Set user-defined background color // Set user-defined background color
if (!(m_opts.transparent = conf.get(bs, "tray-transparent", m_opts.transparent))) { auto bg = conf.get(bs, "tray-background", ""s);
auto bg = conf.get(bs, "tray-background", ""s);
if (bg.length() > 7) { if (!bg.empty()) {
m_log.warn("Alpha support for the systray is limited. See the wiki for more details."); m_opts.background = color_util::parse(bg);
} } else {
m_opts.background = bar_opts.background;
}
if (!bg.empty()) { if (color_util::alpha_channel(m_opts.background) != 1) {
m_opts.background = color_util::parse(bg); m_opts.transparent = true;
} else {
m_opts.background = bar_opts.background;
}
if (color_util::alpha_channel(m_opts.background) != 1) {
m_opts.transparent = true;
//m_opts.background = 0;
}
} }
// Add user-defined padding // Add user-defined padding
@ -211,10 +204,6 @@ void tray_manager::activate() {
return; return;
} }
// Make sure we receive notificatins when the root pixmap changes
m_connection.ensure_event_mask(m_connection.root(), XCB_EVENT_MASK_PROPERTY_CHANGE);
m_connection.flush();
// Attempt to get control of the systray selection then // Attempt to get control of the systray selection then
// notify clients waiting for a manager. // notify clients waiting for a manager.
acquire_selection(); acquire_selection();