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

Merge branch 'master' into next 

Conflicts:
	testcases/t/005-floating.t
This commit is contained in:
Michael Stapelberg 2012-01-21 14:22:29 +00:00
parent 6ffc0f94cb cccf078f1e
commit fc27c19761
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/floating.c
View File

@ -176,6 +176,14 @@ void floating_enable(Con *con, bool automatic) {
if (automatic)
con->border_style = config.default_floating_border;
/* 5: Subtract the deco_height in order to make the floating window appear
* at precisely the position it specified in its original geometry (which
* is what applications might remember). */
deco_height = (con->border_style == BS_NORMAL ? config.font.height + 5 : 0);
nc->rect.y -= deco_height;
DLOG("Corrected y = %d (deco_height = %d)\n", nc->rect.y, deco_height);
TAILQ_INSERT_TAIL(&(nc->nodes_head), con, nodes);
TAILQ_INSERT_TAIL(&(nc->focus_head), con, focused);

8
testcases/t/005-floating.t
View File

@ -18,7 +18,7 @@ ok($absolute->{x} != 0 && $absolute->{y} != 0, 'i3 did not map it to (0x0)');
$window->unmap;
$window = open_floating_window(rect => [ 1, 1, 80, 90 ]);
$window = open_floating_window(rect => [ 20, 20, 80, 90 ]);
isa_ok($window, 'X11::XCB::Window');
@ -27,10 +27,8 @@ isa_ok($window, 'X11::XCB::Window');
cmp_ok($absolute->{width}, '==', 80, "i3 let the width at 80");
cmp_ok($absolute->{height}, '==', 90, "i3 let the height at 90");
# We need to compare the position with decorations due to the way
# we do decoration rendering (on the parent frame) in the tree branch
cmp_ok($top->{x}, '==', 1, 'i3 mapped it to x=1');
cmp_ok($top->{y}, '==', 19, 'i3 mapped it to y=18');
cmp_ok($top->{x}, '==', 20, 'i3 mapped it to x=20');
cmp_ok($top->{y}, '==', 20, 'i3 mapped it to y=20');
$window->unmap;