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

fix(tray): Synchrounous unmap of empty tray window

Browse Source
This commit is contained in:
Michael Carlberg 2016-10-26 15:17:33 +02:00
parent a1c018193a
commit 2661e87d83
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/components/x11/tray.hpp
View File

@ -231,9 +231,10 @@ class traymanager
void reconfigure() { void reconfigure() {
// Ignore reconfigure requests when the // Ignore reconfigure requests when the
// tray window is in the pseudo-hidden state // tray window is in the pseudo-hidden state
if (m_hidden) { if (m_hidden)
return;
if (m_tray == XCB_NONE)
return; return;
}
uint32_t width = 0; uint32_t width = 0;
uint16_t mapped_clients = 0; uint16_t mapped_clients = 0;
@ -249,18 +250,20 @@ class traymanager
g_signals::tray::report_slotcount(mapped_clients); g_signals::tray::report_slotcount(mapped_clients);
if (!width && m_mapped) { if (!width && m_mapped) {
m_connection.unmap_window(m_tray); m_connection.unmap_window_checked(m_tray);
return; return;
} else if (width && !m_mapped) { } else if (width && !m_mapped) {
m_connection.map_window(m_tray); m_connection.map_window_checked(m_tray);
m_lastwidth = 0; m_lastwidth = 0;
return; return;
} else if (!width) { } else if (!width) {
return; return;
} }
if ((width += m_settings.spacing) == m_lastwidth) if ((width += m_settings.spacing) == m_lastwidth) {
return; return;
}
m_lastwidth = width; m_lastwidth = width;
// update window // update window