mirror of
https://github.com/rad4day/Waybar.git
synced 2023-12-21 10:22:59 +01:00
Merge pull request #1274 from RobertMueller2/master
sway/window: include floating_nodes when considering window count for class
This commit is contained in:
commit
6eb9606f23
@ -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;
|
||||||
|
if (!nodes.empty()) {
|
||||||
for(auto const& node : nodes)
|
for(auto const& node : nodes)
|
||||||
sum += leafNodesInWorkspace(node);
|
sum += leafNodesInWorkspace(node);
|
||||||
|
}
|
||||||
|
if (!floating_nodes.empty()) {
|
||||||
|
for(auto const& node : floating_nodes)
|
||||||
|
sum += leafNodesInWorkspace(node);
|
||||||
|
}
|
||||||
return sum;
|
return sum;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user