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

Merge pull request #1274 from RobertMueller2/master 

sway/window: include floating_nodes when considering window count for class
pull/1301/head
Alex 2021-10-03 10:27:26 +02:00 committed by GitHub
parent 03ebbf6d98 9972384597
commit 6eb9606f23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/modules/sway/window.cpp
View File

@ -68,15 +68,22 @@ auto Window::update() -> void {
int leafNodesInWorkspace(const Json::Value& node) { int leafNodesInWorkspace(const Json::Value& node) {
auto const& nodes = node["nodes"]; auto const& nodes = node["nodes"];
if(nodes.empty()) { auto const& floating_nodes = node["floating_nodes"];
if(nodes.empty() && floating_nodes.empty()) {
if(node["type"] == "workspace") if(node["type"] == "workspace")
return 0; return 0;
else else
return 1; return 1;
} }
int sum = 0; int sum = 0;
for(auto const& node : nodes) if (!nodes.empty()) {
sum += leafNodesInWorkspace(node); for(auto const& node : nodes)
sum += leafNodesInWorkspace(node);
}
if (!floating_nodes.empty()) {
for(auto const& node : floating_nodes)
sum += leafNodesInWorkspace(node);
}
return sum; return sum;
} }