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 2011-08-09 09:47:10 +02:00
parent 639a4baf7b 042b10e068
commit f8d834c62d
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/userguide
View File

@ -789,11 +789,11 @@ mode "resize" {
bindsym j resize shrink left bindsym j resize shrink left
bindsym Shift+j resize grow left bindsym Shift+j resize grow left
bindsym k resize grow bottom bindsym k resize grow down
bindsym Shift+k resize shrink bottom bindsym Shift+k resize shrink down
bindsym l resize shrink top bindsym l resize shrink up
bindsym Shift+l resize grow top bindsym Shift+l resize grow up
bindsym semicolon resize grow right bindsym semicolon resize grow right
bindsym Shift+semicolon resize shrink right bindsym Shift+semicolon resize shrink right

5
i3-migrate-config-to-v4
View File

@ -289,6 +289,11 @@ sub convert_command {
my ($direction, $sign, $px) = ($command =~ /^resize (left|right|top|bottom) ([+-])([0-9]+)/); my ($direction, $sign, $px) = ($command =~ /^resize (left|right|top|bottom) ([+-])([0-9]+)/);
my $cmd = 'resize '; my $cmd = 'resize ';
$cmd .= ($sign eq '+' ? 'grow' : 'shrink') . ' '; $cmd .= ($sign eq '+' ? 'grow' : 'shrink') . ' ';
if ($direction eq 'top') {
$direction = 'up';
} elsif ($direction eq 'bottom') {
$direction = 'down';
}
$cmd .= "$direction "; $cmd .= "$direction ";
$cmd .= "$px px"; $cmd .= "$px px";
print qq|$statement $key $cmd\n|; print qq|$statement $key $cmd\n|;

4
testcases/t/71-config-migrate.t
View File

@ -256,13 +256,13 @@ $output = migrate_config('bindsym Mod1+f resize left +10');
ok(line_exists($output, qr|^bindsym Mod1\+f resize grow left 10 px$|), 'resize left changed'); ok(line_exists($output, qr|^bindsym Mod1\+f resize grow left 10 px$|), 'resize left changed');
$output = migrate_config('bindsym Mod1+f resize top -20'); $output = migrate_config('bindsym Mod1+f resize top -20');
ok(line_exists($output, qr|^bindsym Mod1\+f resize shrink top 20 px$|), 'resize top changed'); ok(line_exists($output, qr|^bindsym Mod1\+f resize shrink up 20 px$|), 'resize top changed');
$output = migrate_config('bindsym Mod1+f resize right -20'); $output = migrate_config('bindsym Mod1+f resize right -20');
ok(line_exists($output, qr|^bindsym Mod1\+f resize shrink right 20 px$|), 'resize right changed'); ok(line_exists($output, qr|^bindsym Mod1\+f resize shrink right 20 px$|), 'resize right changed');
$output = migrate_config('bindsym Mod1+f resize bottom +23'); $output = migrate_config('bindsym Mod1+f resize bottom +23');
ok(line_exists($output, qr|^bindsym Mod1\+f resize grow bottom 23 px$|), 'resize bottom changed'); ok(line_exists($output, qr|^bindsym Mod1\+f resize grow down 23 px$|), 'resize bottom changed');
##################################################################### #####################################################################
# check whether jump's parameters get changed correctly # check whether jump's parameters get changed correctly