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 2012-05-28 23:37:26 +02:00
parent d154d347ec 24b1fcfd1a
commit 1103f94c34
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
testcases/t/130-close-empty-split.t
View File

@ -22,10 +22,10 @@ my ($nodes, $focus) = get_ws_content($tmp);
is($nodes->[0]->{focused}, 0, 'split container not focused'); is($nodes->[0]->{focused}, 0, 'split container not focused');
# focus the split container # focus the split container
cmd 'level up'; cmd 'focus parent';
($nodes, $focus) = get_ws_content($tmp); ($nodes, $focus) = get_ws_content($tmp);
my $split = $focus->[0]; my $split = $focus->[0];
cmd 'level down'; cmd 'focus child';
$second = open_empty_con($i3); $second = open_empty_con($i3);
@ -60,10 +60,10 @@ cmd 'split v';
is($nodes->[0]->{focused}, 0, 'split container not focused'); is($nodes->[0]->{focused}, 0, 'split container not focused');
# focus the split container # focus the split container
cmd 'level up'; cmd 'focus parent';
($nodes, $focus) = get_ws_content($tmp); ($nodes, $focus) = get_ws_content($tmp);
$split = $focus->[0]; $split = $focus->[0];
cmd 'level down'; cmd 'focus child';
$second = open_empty_con($i3); $second = open_empty_con($i3);

2
testcases/t/147-regress-floatingmove.t
View File

@ -18,7 +18,7 @@ my $mid = open_window;
my $right = open_window; my $right = open_window;
# go to workspace level # go to workspace level
sync_cmd 'level up'; sync_cmd 'focus parent';
# make it floating # make it floating
sync_cmd 'mode toggle'; sync_cmd 'mode toggle';

4
testcases/t/152-regress-level-up.t
View File

@ -9,8 +9,8 @@ use i3test;
fresh_workspace; fresh_workspace;
cmd 'open'; cmd 'open';
cmd 'level up'; cmd 'focus parent';
cmd 'level up'; cmd 'focus parent';
cmd 'mode toggle'; cmd 'mode toggle';
does_i3_live; does_i3_live;

2
testcases/t/157-regress-fullscreen-level-up.t
View File

@ -30,7 +30,7 @@ is($nodes->[0]->{fullscreen_mode}, 1, 'client fullscreen now');
##################################################################### #####################################################################
# send level up, try to un-fullscreen # send level up, try to un-fullscreen
##################################################################### #####################################################################
cmd 'level up'; cmd 'focus parent';
cmd 'fullscreen'; cmd 'fullscreen';
$nodes = get_ws_content $tmp; $nodes = get_ws_content $tmp;