Merge branch 'master' into next

[i3/i3] / src / tree.c

diff --git a/src/tree.c b/src/tree.c
index bdfceac0c0bccd42eb928a7f3f62fa624cd67dab..5559908f0738d20afbbed8e9b5f048a7609a4e65 100644 (file)
--- a/src/tree.c
+++ b/src/tree.c
@@ -342,10 +342,16 @@ void tree_split(Con *con, orientation_t orientation) {
     }
 
     Con *parent = con->parent;
+
+    /* Force re-rendering to make the indicator border visible. */
+    FREE(con->deco_render_params);
+    FREE(parent->deco_render_params);
+
     /* if we are in a container whose parent contains only one
      * child (its split functionality is unused so far), we just change the
      * orientation (more intuitive than splitting again) */
-    if (con_num_children(parent) == 1) {
+    if (con_num_children(parent) == 1 &&
+        parent->layout == L_DEFAULT) {
         parent->orientation = orientation;
         DLOG("Just changing orientation of existing container\n");
         return;