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

fix(tray): Ignore restack state

Browse Source
This commit is contained in:
Michael Carlberg 2016-12-15 21:00:17 +01:00
parent 140a3a6327
commit faab627771
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/x11/tray_manager.hpp
View File

@ -154,8 +154,6 @@ class tray_manager : public xpp::event::sink<evt::expose, evt::visibility_notify
thread m_delaythread; thread m_delaythread;
bool m_restacked{false};
std::mutex m_mtx{}; std::mutex m_mtx{};
chrono::time_point<chrono::system_clock, chrono::milliseconds> m_drawtime; chrono::time_point<chrono::system_clock, chrono::milliseconds> m_drawtime;

10
src/x11/tray_manager.cpp
View File

@ -281,7 +281,6 @@ void tray_manager::deactivate(bool clear_selection) {
m_opts.configured_slots = 0; m_opts.configured_slots = 0;
m_acquired_selection = false; m_acquired_selection = false;
m_mapped = false; m_mapped = false;
m_restacked = false;
m_connection.flush(); m_connection.flush();
@ -601,7 +600,7 @@ void tray_manager::create_bg(bool realloc) {
* Put tray window above the defined sibling in the window stack * Put tray window above the defined sibling in the window stack
*/ */
void tray_manager::restack_window() { void tray_manager::restack_window() {
if (!m_opts.sibling) { if (m_opts.sibling == XCB_NONE) {
return; return;
} }
@ -617,7 +616,6 @@ void tray_manager::restack_window() {
xutils::pack_values(mask, &params, values); xutils::pack_values(mask, &params, values);
m_connection.configure_window_checked(m_tray, mask, values); m_connection.configure_window_checked(m_tray, mask, values);
m_restacked = true;
} catch (const exception& err) { } catch (const exception& err) {
auto id = m_connection.id(m_opts.sibling); auto id = m_connection.id(m_opts.sibling);
m_log.trace("tray: Failed to put tray above %s in the stack (%s)", id, err.what()); m_log.trace("tray: Failed to put tray above %s in the stack (%s)", id, err.what());
@ -1128,10 +1126,12 @@ bool tray_manager::on(const visibility_change& evt) {
bool visible{*evt()}; bool visible{*evt()};
size_t clients{mapped_clients()}; size_t clients{mapped_clients()};
m_log.trace("tray: visibility_change %d", visible); m_log.trace("tray: visibility_change (state=%i, activated=%i, mapped=%i, hidden=%i)", visible,
static_cast<bool>(m_activated), static_cast<bool>(m_mapped), static_cast<bool>(m_hidden));
m_hidden = !visible; m_hidden = !visible;
if (!m_activated || m_restacked) { if (!m_activated) {
return false; return false;
} else if (!m_hidden && !m_mapped && clients) { } else if (!m_hidden && !m_mapped && clients) {
m_connection.map_window(m_tray); m_connection.map_window(m_tray);