Merge branch 'master' into next

diff --cc src/manage.c
index fa3a4958b41c6a63ae25a2b6c0c27f2186bd9be9,a7002bf3abc33c3c4aa1baa559859bb211a45a0f..d86eb06ca441f308dcc9a0f52641cd43f9ceacc6
--- 1/src/manage.c
--- 2/src/manage.c
+++ b/src/manage.c
@@@ -445,16 -450,12 +445,22 @@@ void manage_window(xcb_window_t window
          }
      }
  
 +    if (want_floating) {
 +        DLOG("geometry = %d x %d\n", nc->geometry.width, nc->geometry.height);
 +        /* motif hints will be applied only when `new_float` is `normal` or not
 +         * specified */
 +        bool automatic_border = (config.default_floating_border != BS_NORMAL &&
 +                                 motif_border_style == BS_NORMAL);
 +
 +        floating_enable(nc, automatic_border);
 +    }
 +
+     if (nc->border_style == BS_PIXEL) {
+         /* if the border style is BS_PIXEL, explicitly set the border width of
+          * the new container */
+         nc->current_border_width = (want_floating ? config.default_floating_border_width : config.default_border_width);
+     }
+ 
      /* to avoid getting an UnmapNotify event due to reparenting, we temporarily
       * declare no interest in any state change event of this window */
      values[0] = XCB_NONE;