Add support to resize floating container in percentage

resize set is modified to accept both 'px' and 'ppt' height and width.

Fixes #2816.
This commit is contained in:
Orestis Floros
2017-10-18 02:04:42 +03:00
parent d4eaea8289
commit b17e7b82c6
5 changed files with 75 additions and 10 deletions

View File

@ -17,7 +17,13 @@
# Test behavior of "resize <width> <height>" command.
# Ticket: #1727
# Bug still in: 4.10.2-1-gc0dbc5d
use i3test;
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1333x999+0+0
workspace ws output fake-0
EOT
################################################################################
# Check that setting floating windows size works
@ -42,4 +48,54 @@ cmp_ok($content[0]->{rect}->{height}, '!=', $oldrect->{width}, 'height changed')
cmp_ok($content[0]->{rect}->{width}, '==', 100, 'width changed to 100 px');
cmp_ok($content[0]->{rect}->{height}, '==', 250, 'height changed to 250 px');
################################################################################
# Same but with ppt instead of px
################################################################################
kill_all_windows;
$tmp = 'ws';
cmd "workspace $tmp";
open_floating_window;
@content = @{get_ws($tmp)->{floating_nodes}};
is(@content, 1, 'one floating node on this ws');
$oldrect = $content[0]->{rect};
cmd 'resize set 33 ppt 20 ppt';
my $expected_width = int(0.33 * 1333);
my $expected_height = int(0.2 * 999);
@content = @{get_ws($tmp)->{floating_nodes}};
cmp_ok($content[0]->{rect}->{x}, '==', $oldrect->{x}, 'x untouched');
cmp_ok($content[0]->{rect}->{y}, '==', $oldrect->{y}, 'y untouched');
cmp_ok($content[0]->{rect}->{width}, '!=', $oldrect->{width}, 'width changed');
cmp_ok($content[0]->{rect}->{height}, '!=', $oldrect->{width}, 'height changed');
cmp_ok($content[0]->{rect}->{width}, '==', $expected_width, "width changed to $expected_width px");
cmp_ok($content[0]->{rect}->{height}, '==', $expected_height, "height changed to $expected_height px");
################################################################################
# Mix ppt and px in a single resize set command
################################################################################
cmd 'resize set 44 ppt 111 px';
my $expected_width = int(0.44 * 1333);
my $expected_height = 111;
@content = @{get_ws($tmp)->{floating_nodes}};
cmp_ok($content[0]->{rect}->{x}, '==', $oldrect->{x}, 'x untouched');
cmp_ok($content[0]->{rect}->{y}, '==', $oldrect->{y}, 'y untouched');
cmp_ok($content[0]->{rect}->{width}, '==', $expected_width, "width changed to $expected_width px");
cmp_ok($content[0]->{rect}->{height}, '==', $expected_height, "height changed to $expected_height px");
cmd 'resize set 222 px 100 ppt';
my $expected_width = 222;
my $expected_height = 999;
@content = @{get_ws($tmp)->{floating_nodes}};
cmp_ok($content[0]->{rect}->{x}, '==', $oldrect->{x}, 'x untouched');
cmp_ok($content[0]->{rect}->{y}, '==', $oldrect->{y}, 'y untouched');
cmp_ok($content[0]->{rect}->{width}, '==', $expected_width, "width changed to $expected_width px");
cmp_ok($content[0]->{rect}->{height}, '==', $expected_height, "height changed to $expected_height px");
done_testing;