de94f6da1a
With this commit, the "default" layout is replaced by the splith and splitv layouts. splith is equivalent to default with orientation horizontal and splitv is equivalent to default with orientation vertical. The "split h" and "split v" commands continue to work as before, they split the current container and you will end up in a split container with layout splith (after "split h") or splitv (after "split v"). To change a splith container into a splitv container, use either "layout splitv" or "layout toggle split". The latter command is used in the default config as mod+l (previously "layout default"). In case you have "layout default" in your config file, it is recommended to just replace it by "layout toggle split", which will work as "layout default" did before when pressing it once, but toggle between horizontal/vertical when pressing it repeatedly. The rationale behind this commit is that it’s cleaner to have all parameters that influence how windows are rendered in the layout itself rather than having a special parameter in combination with only one layout. This enables us to change existing split containers in all cases without breaking existing features (see ticket #464). Also, users should feel more confident about whether they are actually splitting or just changing an existing split container now. As a nice side-effect, this commit brings back the "layout toggle" feature we once had in i3 version 3 (see the userguide). AFAIK, it is safe to use in-place restart to upgrade into versions after this commit (switching to an older version will break your layout, though). Fixes #464
85 lines
2.4 KiB
Perl
85 lines
2.4 KiB
Perl
#!perl
|
|
# vim:ts=4:sw=4:expandtab
|
|
# Verifies that switching between the different layouts works as expected.
|
|
use i3test;
|
|
|
|
my $tmp = fresh_workspace;
|
|
|
|
open_window;
|
|
open_window;
|
|
cmd 'split v';
|
|
open_window;
|
|
|
|
my ($nodes, $focus) = get_ws_content($tmp);
|
|
is($nodes->[1]->{layout}, 'splitv', 'layout is splitv currently');
|
|
|
|
cmd 'layout stacked';
|
|
($nodes, $focus) = get_ws_content($tmp);
|
|
is($nodes->[1]->{layout}, 'stacked', 'layout now stacked');
|
|
|
|
cmd 'layout tabbed';
|
|
($nodes, $focus) = get_ws_content($tmp);
|
|
is($nodes->[1]->{layout}, 'tabbed', 'layout now tabbed');
|
|
|
|
cmd 'layout toggle split';
|
|
($nodes, $focus) = get_ws_content($tmp);
|
|
is($nodes->[1]->{layout}, 'splitv', 'layout now splitv again');
|
|
|
|
cmd 'layout toggle split';
|
|
($nodes, $focus) = get_ws_content($tmp);
|
|
is($nodes->[1]->{layout}, 'splith', 'layout now splith');
|
|
|
|
cmd 'layout toggle split';
|
|
($nodes, $focus) = get_ws_content($tmp);
|
|
is($nodes->[1]->{layout}, 'splitv', 'layout now splitv');
|
|
|
|
cmd 'layout toggle split';
|
|
($nodes, $focus) = get_ws_content($tmp);
|
|
is($nodes->[1]->{layout}, 'splith', 'layout now splith');
|
|
|
|
cmd 'layout toggle';
|
|
($nodes, $focus) = get_ws_content($tmp);
|
|
is($nodes->[1]->{layout}, 'stacked', 'layout now stacked');
|
|
|
|
cmd 'layout toggle';
|
|
($nodes, $focus) = get_ws_content($tmp);
|
|
is($nodes->[1]->{layout}, 'tabbed', 'layout now tabbed');
|
|
|
|
cmd 'layout toggle';
|
|
($nodes, $focus) = get_ws_content($tmp);
|
|
is($nodes->[1]->{layout}, 'splith', 'layout now splith');
|
|
|
|
cmd 'layout toggle';
|
|
($nodes, $focus) = get_ws_content($tmp);
|
|
is($nodes->[1]->{layout}, 'stacked', 'layout now stacked');
|
|
|
|
cmd 'layout toggle all';
|
|
($nodes, $focus) = get_ws_content($tmp);
|
|
is($nodes->[1]->{layout}, 'tabbed', 'layout now tabbed');
|
|
|
|
cmd 'layout toggle all';
|
|
($nodes, $focus) = get_ws_content($tmp);
|
|
is($nodes->[1]->{layout}, 'splith', 'layout now splith');
|
|
|
|
cmd 'layout toggle all';
|
|
($nodes, $focus) = get_ws_content($tmp);
|
|
is($nodes->[1]->{layout}, 'splitv', 'layout now splitv');
|
|
|
|
cmd 'layout toggle all';
|
|
($nodes, $focus) = get_ws_content($tmp);
|
|
is($nodes->[1]->{layout}, 'stacked', 'layout now stacked');
|
|
|
|
cmd 'layout toggle all';
|
|
($nodes, $focus) = get_ws_content($tmp);
|
|
is($nodes->[1]->{layout}, 'tabbed', 'layout now tabbed');
|
|
|
|
cmd 'layout toggle all';
|
|
($nodes, $focus) = get_ws_content($tmp);
|
|
is($nodes->[1]->{layout}, 'splith', 'layout now splith');
|
|
|
|
cmd 'layout toggle all';
|
|
($nodes, $focus) = get_ws_content($tmp);
|
|
is($nodes->[1]->{layout}, 'splitv', 'layout now splitv');
|
|
|
|
done_testing;
|