Merge branch 'master' into next

[i3/i3] / src / floating.c

diff --git a/src/floating.c b/src/floating.c
index 8d3ce4e244a9059ebfe20c6f981ed31d028180f4..2fbf66bcfb275dc4a7f1a030e1e5d71589ea6fef 100644 (file)
--- a/src/floating.c
+++ b/src/floating.c
@@ -173,6 +173,10 @@ void floating_enable(Con *con, bool automatic) {
     con->percent = 1.0;
     con->floating = FLOATING_USER_ON;
 
+    /* 4: set the border style as specified with new_float */
+    if (automatic)
+        con->border_style = config.default_floating_border;
+
     TAILQ_INSERT_TAIL(&(nc->nodes_head), con, nodes);
     TAILQ_INSERT_TAIL(&(nc->focus_head), con, focused);