Bugfix: Obey workspace_layout when re-inserting floating containers (+test) (Thanks...

[i3/i3] / src / floating.c

diff --git a/src/floating.c b/src/floating.c
index f7dd2ebc57a134b8b8f4b21668d33350501fd39e..0637521fbce020630c22ec98bd8f2efffee3785a 100644 (file)
--- a/src/floating.c
+++ b/src/floating.c
@@ -238,11 +238,10 @@ void floating_disable(Con *con, bool automatic) {
     /* con_fix_percent will adjust the percent value */
     con->percent = 0.0;
 
-    TAILQ_INSERT_TAIL(&(con->parent->nodes_head), con, nodes);
-    TAILQ_INSERT_TAIL(&(con->parent->focus_head), con, focused);
-
     con->floating = FLOATING_USER_OFF;
 
+    con_attach(con, con->parent, false);
+
     con_fix_percent(con->parent);
     // TODO: don’t influence focus handling when Con was not focused before.
     con_focus(con);