Merge branch 'master' into next
This commit is contained in:
commit
2d28273cac
|
@ -455,6 +455,12 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
|
|||
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;
|
||||
|
|
|
@ -66,7 +66,7 @@ $first = open_window;
|
|||
@content = @{get_ws_content($tmp)};
|
||||
ok(@content == 1, 'one container opened');
|
||||
is($content[0]->{border}, 'pixel', 'border pixel by default');
|
||||
is($content[0]->{current_border_width}, -1, 'border width pixels -1 (default)');
|
||||
is($content[0]->{current_border_width}, 1, 'border width pixels 1 (default)');
|
||||
|
||||
exit_gracefully($pid);
|
||||
|
||||
|
|
Loading…
Reference in New Issue