t/*ewmh*: fix flakiness by syncing

[i3/i3] / src / manage.c

diff --git a/src/manage.c b/src/manage.c
index d86eb06ca441f308dcc9a0f52641cd43f9ceacc6..b7ea5e69e1aa3ce08e8ba864ef97fb368148d51a 100644 (file)
--- a/src/manage.c
+++ b/src/manage.c
@@ -447,19 +447,15 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
 
     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);
+        /* automatically set the border to the default value if a motif border
+         * was not specified */
+        bool automatic_border = (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);
-    }
+    /* explicitly set the border width to the default */
+    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 */