Fixed the multiple window movement issue from #5382

i3 · Jun 18, 2023 · 98978e1 · 98978e1
1 parent a958701
commit 98978e1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/release-notes/bugfixes/3-moving-multiple b/release-notes/bugfixes/3-moving-multiple
@@ -0,0 +1 @@
+Fixed the multiple window movement issue from #5382
diff --git a/src/move.c b/src/move.c
@@ -264,8 +264,20 @@ void tree_move(Con *con, direction_t direction) {
     /* 1: get the first parent with the same orientation */
 
     if (con->type == CT_WORKSPACE) {
-        DLOG("Not moving workspace\n");
-        return;
+        /* If there is already a split container for the windows in the workspace, use that. */
+        /* Otherwise, make a split container for them and move that split container. This way, moving multiple windows at a time from a workspace works as expected. */
+        const bool moves_focus = (focused == con);
+        Con *first_child = TAILQ_FIRST(&(con->nodes_head));
+        if (!con_is_leaf(first_child) && con_num_children(con) == 1) {
+            con = first_child;
+        } else {
+            if ((con = workspace_encapsulate(con)) == NULL) {
+                return;
+            }
+        }
+        if (moves_focus) {
+            con_focus(con);
+        }
     }
 
     if (con->fullscreen_mode == CF_GLOBAL) {