Use case: * When managing multiple terminals in a workspace, the borders makes it easier to know where the focus is, but when there is only one it's obvious where the focus is. * When there's only a web browser for example, the borders are actually counter- productive since it makes clicking a side scrollbar or a tab a bit harder (if I smash my cursor to the side or the top of the workspace, I have to move it in the other direction by just a few pixels to be able to grab it) Behaviour: * No borders when there's a single window in a workspace * Borders when there are multiple windows in a workspace fixes #2188
This commit is contained in:
Julien Lequertier
committed by
Michael Stapelberg
Michael Stapelberg
parent
47562b4143
commit
4bec3b9d24
@ -286,6 +286,7 @@ hide_edge_borders none
|
||||
hide_edge_borders vertical
|
||||
hide_edge_borders horizontal
|
||||
hide_edge_borders both
|
||||
hide_edge_borders smart
|
||||
EOT
|
||||
|
||||
$expected = <<'EOT';
|
||||
@ -293,6 +294,7 @@ cfg_hide_edge_borders(none)
|
||||
cfg_hide_edge_borders(vertical)
|
||||
cfg_hide_edge_borders(horizontal)
|
||||
cfg_hide_edge_borders(both)
|
||||
cfg_hide_edge_borders(smart)
|
||||
EOT
|
||||
|
||||
is(parser_calls($config),
|
||||
@ -464,7 +466,7 @@ client.focused #4c7899 #285577 #ffffff #2e9ef4
|
||||
EOT
|
||||
|
||||
$expected = <<'EOT';
|
||||
ERROR: CONFIG: Expected one of these tokens: 'none', 'vertical', 'horizontal', 'both', '1', 'yes', 'true', 'on', 'enable', 'active'
|
||||
ERROR: CONFIG: Expected one of these tokens: 'none', 'vertical', 'horizontal', 'both', 'smart', '1', 'yes', 'true', 'on', 'enable', 'active'
|
||||
ERROR: CONFIG: (in file <stdin>)
|
||||
ERROR: CONFIG: Line 1: hide_edge_borders FOOBAR
|
||||
ERROR: CONFIG: ^^^^^^
|
||||
|
||||
159
testcases/t/263-edge-borders.t
Normal file
159
testcases/t/263-edge-borders.t
Normal file
@ -0,0 +1,159 @@
|
||||
#!perl
|
||||
# vim:ts=4:sw=4:expandtab
|
||||
#
|
||||
# Please read the following documents before working on tests:
|
||||
# • http://build.i3wm.org/docs/testsuite.html
|
||||
# (or docs/testsuite)
|
||||
#
|
||||
# • http://build.i3wm.org/docs/lib-i3test.html
|
||||
# (alternatively: perldoc ./testcases/lib/i3test.pm)
|
||||
#
|
||||
# • http://build.i3wm.org/docs/ipc.html
|
||||
# (or docs/ipc)
|
||||
#
|
||||
# • http://onyxneon.com/books/modern_perl/modern_perl_a4.pdf
|
||||
# (unless you are already familiar with Perl)
|
||||
#
|
||||
# Tests that the hide_edge_borders smart option works
|
||||
# Ticket: #2188
|
||||
|
||||
use i3test i3_autostart => 0;
|
||||
|
||||
####################################################################
|
||||
# 1: check that the borders are present on a floating windows
|
||||
#####################################################################
|
||||
|
||||
my $config = <<EOT;
|
||||
# i3 config file (v4)
|
||||
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
|
||||
|
||||
new_window pixel 2
|
||||
new_float pixel 2
|
||||
hide_edge_borders smart
|
||||
EOT
|
||||
|
||||
my $pid = launch_with_config($config);
|
||||
|
||||
my $tmp = fresh_workspace;
|
||||
|
||||
ok(@{get_ws_content($tmp)} == 0, 'no containers yet');
|
||||
|
||||
my $floatwindow = open_floating_window;
|
||||
|
||||
my $wscontent = get_ws($tmp);
|
||||
|
||||
my @floating = @{$wscontent->{floating_nodes}};
|
||||
ok(@floating == 1, 'one floating container opened');
|
||||
is($floating[0]->{nodes}[0]->{current_border_width}, 2, 'floating current border width set to 2');
|
||||
is($floatwindow->rect->width, $floating[0]->{rect}->{width} - 2*2, 'floating border width 2');
|
||||
|
||||
exit_gracefully($pid);
|
||||
|
||||
#####################################################################
|
||||
# 2: check that the borders are present on a workspace with two tiled
|
||||
# windows visible
|
||||
#####################################################################
|
||||
|
||||
$config = <<EOT;
|
||||
# i3 config file (v4)
|
||||
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
|
||||
|
||||
new_window pixel 2
|
||||
new_float pixel 2
|
||||
hide_edge_borders smart
|
||||
EOT
|
||||
|
||||
$pid = launch_with_config($config);
|
||||
|
||||
$tmp = fresh_workspace;
|
||||
|
||||
ok(@{get_ws_content($tmp)} == 0, 'no containers yet');
|
||||
|
||||
my $tilewindow = open_window;
|
||||
my $tilewindow2 = open_window;
|
||||
|
||||
$wscontent = get_ws($tmp);
|
||||
|
||||
my @tiled = @{$wscontent->{nodes}};
|
||||
ok(@tiled == 2, 'two tiled container opened');
|
||||
is($tiled[0]->{current_border_width}, 2, 'first tiled current border width set to 2');
|
||||
is($tilewindow->rect->width, $tiled[0]->{rect}->{width} - 2*2, 'first tiled border width 2');
|
||||
is($tiled[1]->{current_border_width}, 2, 'second tiled current border width set to 2');
|
||||
is($tilewindow2->rect->width, $tiled[1]->{rect}->{width} - 2*2, 'second tiled border width 2');
|
||||
|
||||
exit_gracefully($pid);
|
||||
|
||||
#####################################################################
|
||||
# 3: check that the borders are hidden on a workspace with one tiled
|
||||
# window visible
|
||||
#####################################################################
|
||||
|
||||
$config = <<EOT;
|
||||
# i3 config file (v4)
|
||||
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
|
||||
|
||||
new_window pixel 2
|
||||
new_float pixel 2
|
||||
hide_edge_borders smart
|
||||
EOT
|
||||
|
||||
$pid = launch_with_config($config);
|
||||
|
||||
$tmp = fresh_workspace;
|
||||
|
||||
ok(@{get_ws_content($tmp)} == 0, 'no containers yet');
|
||||
|
||||
$tilewindow = open_window;
|
||||
|
||||
$wscontent = get_ws($tmp);
|
||||
|
||||
@tiled = @{$wscontent->{nodes}};
|
||||
ok(@tiled == 1, 'one tiled container opened');
|
||||
is($tiled[0]->{current_border_width}, 2, 'tiled current border width set to 2');
|
||||
is($tilewindow->rect->width, $tiled[0]->{rect}->{width} - 2*0, 'single tiled border width 0');
|
||||
|
||||
exit_gracefully($pid);
|
||||
|
||||
#####################################################################
|
||||
# 4: check that the borders are present on a workspace with two tiled
|
||||
# windows visible, recursively
|
||||
#####################################################################
|
||||
|
||||
$config = <<EOT;
|
||||
# i3 config file (v4)
|
||||
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
|
||||
|
||||
new_window pixel 2
|
||||
new_float pixel 2
|
||||
hide_edge_borders smart
|
||||
EOT
|
||||
|
||||
$pid = launch_with_config($config);
|
||||
|
||||
$tmp = fresh_workspace;
|
||||
|
||||
ok(@{get_ws_content($tmp)} == 0, 'no containers yet');
|
||||
|
||||
$tilewindow = open_window;
|
||||
$tilewindow2 = open_window;
|
||||
ok(@{get_ws_content($tmp)} == 2, 'two containers opened');
|
||||
|
||||
cmd 'layout tabbed';
|
||||
ok(@{get_ws_content($tmp)} == 1, 'layout tabbed -> back to one container');
|
||||
|
||||
cmd 'focus parent';
|
||||
my $tilewindow3 = open_window;
|
||||
ok(@{get_ws_content($tmp)} == 2, 'after split & new window, two containers');
|
||||
|
||||
$wscontent = get_ws($tmp);
|
||||
|
||||
@tiled = @{$wscontent->{nodes}};
|
||||
ok(@tiled == 2, 'two tiled container opened in another container');
|
||||
is($tiled[0]->{current_border_width}, -1, 'first tiled current border width set to -1');
|
||||
is($tilewindow->rect->width, $tiled[0]->{rect}->{width} - 2*2, 'first tiled border width 2');
|
||||
is($tiled[1]->{current_border_width}, 2, 'second tiled current border width set to 2');
|
||||
is($tilewindow2->rect->width, $tiled[1]->{rect}->{width} - 2*2, 'second tiled border width 2');
|
||||
|
||||
exit_gracefully($pid);
|
||||
|
||||
done_testing;
|
||||
Reference in New Issue
Block a user