diff --git a/docs/userguide b/docs/userguide index 4a11cb1b..158ed553 100644 --- a/docs/userguide +++ b/docs/userguide @@ -789,11 +789,11 @@ mode "resize" { bindsym j resize shrink left bindsym Shift+j resize grow left - bindsym k resize grow bottom - bindsym Shift+k resize shrink bottom + bindsym k resize grow down + bindsym Shift+k resize shrink down - bindsym l resize shrink top - bindsym Shift+l resize grow top + bindsym l resize shrink up + bindsym Shift+l resize grow up bindsym semicolon resize grow right bindsym Shift+semicolon resize shrink right diff --git a/i3-migrate-config-to-v4 b/i3-migrate-config-to-v4 index 5f20cba1..0a8db2de 100755 --- a/i3-migrate-config-to-v4 +++ b/i3-migrate-config-to-v4 @@ -289,6 +289,11 @@ sub convert_command { my ($direction, $sign, $px) = ($command =~ /^resize (left|right|top|bottom) ([+-])([0-9]+)/); my $cmd = 'resize '; $cmd .= ($sign eq '+' ? 'grow' : 'shrink') . ' '; + if ($direction eq 'top') { + $direction = 'up'; + } elsif ($direction eq 'bottom') { + $direction = 'down'; + } $cmd .= "$direction "; $cmd .= "$px px"; print qq|$statement $key $cmd\n|; diff --git a/testcases/t/71-config-migrate.t b/testcases/t/71-config-migrate.t index 4e97fb27..fb331c48 100644 --- a/testcases/t/71-config-migrate.t +++ b/testcases/t/71-config-migrate.t @@ -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'); $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'); 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'); -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