From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 28 Jun 2014 11:01:48 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.9~83
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2d28273cac9643f6a6e71b3f434ac1318238d686;p=i3%2Fi3

Merge branch 'master' into next
---

2d28273cac9643f6a6e71b3f434ac1318238d686
diff --cc src/manage.c
index fa3a4958,a7002bf3..d86eb06c
--- a/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;