revert the replacement of a single h/v-split with its child container

Makes more problems than it creates. Will use a different fix suggested by
Merovius.

diff --git a/src/con.c b/src/con.c
index 92b05fd7430f6dbc0a7f5a9093ee6000c76617b8..8992d13289249d29acd3a896380f6c3729a66005 100644 (file)
--- a/src/con.c
+++ b/src/con.c
@@ -787,28 +787,4 @@ static void con_on_remove_child(Con *con) {
         tree_close(con, false, false);
         return;
     }
-
-    /* If we did not close the container, check if we have only a single child left */
-    if (children == 1) {
-        Con *child = TAILQ_FIRST(&(con->nodes_head));
-        Con *parent = con->parent;
-        DLOG("Container has only one child, replacing con %p with child %p\n", con, child);
-
-        /* TODO: refactor it into con_swap */
-        TAILQ_REPLACE(&(parent->nodes_head), con, child, nodes);
-        TAILQ_REPLACE(&(parent->focus_head), con, child, focused);
-        if (focused == con)
-            focused = child;
-        child->parent = parent;
-        child->percent = 0.0;
-        con_fix_percent(parent);
-
-        con->parent = NULL;
-        x_con_kill(con);
-        free(con->name);
-        TAILQ_REMOVE(&all_cons, con, all_cons);
-        free(con);
-
-        return;
-    }
 }

diff --git a/testcases/t/24-move.t b/testcases/t/24-move.t
index e887b9f3c66cae7a2ebea817bd506c97ea8e64b7..993f48b065966859dc6b63fb0c57613029f14483 100644 (file)
--- a/testcases/t/24-move.t
+++ b/testcases/t/24-move.t
@@ -109,7 +109,7 @@ is(@{$content}, 3, 'three nodes on this workspace');
 # will be replaced by the con itself, so we will still have 3 nodes
 $i3->command('move right')->recv;
 $content = get_ws_content($tmp);
-is(@{$content}, 3, 'two nodes on this workspace');
+is(@{$content}, 2, 'two nodes on this workspace');
 
 ######################################################################
 # 4) We create two v-split containers on the workspace, then we move