1 files changed, 15 insertions, 0 deletions

diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index b8e90892..18746430 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -557,6 +557,7 @@ struct sway_container *workspace_find_container(struct sway_workspace *ws,
 }
 
 struct sway_container *workspace_wrap_children(struct sway_workspace *ws) {
+        struct sway_container *fs = ws->fullscreen;
         struct sway_container *middle = container_create(NULL);
         middle->layout = ws->layout;
         while (ws->tiling->length) {
@@ -565,6 +566,7 @@ struct sway_container *workspace_wrap_children(struct sway_workspace *ws) {
                 container_add_child(middle, child);
         }
         workspace_add_tiling(ws, middle);
+        ws->fullscreen = fs;
         return middle;
 }
 
@@ -694,3 +696,16 @@ void workspace_get_box(struct sway_workspace *workspace, struct wlr_box *box) {
         box->width = workspace->width;
         box->height = workspace->height;
 }
+
+static void count_tiling_views(struct sway_container *con, void *data) {
+        if (con->view && !container_is_floating_or_child(con)) {
+                size_t *count = data;
+                *count += 1;
+        }
+}
+
+size_t workspace_num_tiling_views(struct sway_workspace *ws) {
+        size_t count = 0;
+        workspace_for_each_container(ws, count_tiling_views, &count);
+        return count;
+}