RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(workspaces): buttons iterator

pull/25/head
Alexis 2018-08-15 14:30:01 +02:00
parent d1d51b76aa
commit 767d9dd5b4
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/modules/workspaces.cpp
View File

@ -34,13 +34,14 @@ auto waybar::modules::Workspaces::update() -> void
{ {
std::lock_guard<std::mutex> lock(_mutex); std::lock_guard<std::mutex> lock(_mutex);
bool needReorder = false; bool needReorder = false;
for (auto it = _buttons.begin(); it != _buttons.end(); ++it) { for (auto it = _buttons.begin(); it != _buttons.end();) {
auto ws = std::find_if(_workspaces.begin(), _workspaces.end(), auto ws = std::find_if(_workspaces.begin(), _workspaces.end(),
[it](auto node) -> bool { return node["num"].asInt() == it->first; }); [it](auto node) -> bool { return node["num"].asInt() == it->first; });
if (ws == _workspaces.end()) { if (ws == _workspaces.end()) {
it = _buttons.erase(it); it = _buttons.erase(it);
needReorder = true; needReorder = true;
} } else
++it;
} }
for (auto node : _workspaces) { for (auto node : _workspaces) {
if (_bar.outputName != node["output"].asString()) if (_bar.outputName != node["output"].asString())
@ -51,12 +52,10 @@ auto waybar::modules::Workspaces::update() -> void
needReorder = true; needReorder = true;
} else { } else {
auto &button = it->second; auto &button = it->second;
bool isCurrent = node["focused"].asBool(); if (node["focused"].asBool())
if (!isCurrent) {
button.get_style_context()->remove_class("current");
} else if (isCurrent) {
button.get_style_context()->add_class("current"); button.get_style_context()->add_class("current");
} else
button.get_style_context()->remove_class("current");
if (needReorder) if (needReorder)
_box.reorder_child(button, node["num"].asInt()); _box.reorder_child(button, node["num"].asInt());
button.show(); button.show();