nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2014-06-28 13:01:48 +02:00
parent 01a2c5a3f1 a1f6bfbf7e
commit 2d28273cac
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/manage.c
View File

@ -455,6 +455,12 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
floating_enable(nc, automatic_border); 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 /* to avoid getting an UnmapNotify event due to reparenting, we temporarily
* declare no interest in any state change event of this window */ * declare no interest in any state change event of this window */
values[0] = XCB_NONE; values[0] = XCB_NONE;

2
testcases/t/174-border-config.t
View File

@ -66,7 +66,7 @@ $first = open_window;
@content = @{get_ws_content($tmp)}; @content = @{get_ws_content($tmp)};
ok(@content == 1, 'one container opened'); ok(@content == 1, 'one container opened');
is($content[0]->{border}, 'pixel', 'border pixel by default'); 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); exit_gracefully($pid);