sway/window: include floating_nodes when considering window count for…

… class
Alexays · Oct 2, 2021 · 9972384 · 9972384
1 parent 7af6e84
commit 9972384
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/modules/sway/window.cpp b/src/modules/sway/window.cpp
@@ -68,15 +68,22 @@ auto Window::update() -> void {
 
 int leafNodesInWorkspace(const Json::Value& node) {
   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")
       return 0;
     else
       return 1;
   }
   int sum = 0;
-  for(auto const& node : nodes)
-    sum += leafNodesInWorkspace(node);
+  if (!nodes.empty()) {
+    for(auto const& node : nodes)
+      sum += leafNodesInWorkspace(node);
+  }
+  if (!floating_nodes.empty()) {
+    for(auto const& node : floating_nodes)
+      sum += leafNodesInWorkspace(node);
+  }
   return sum;
 }