nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1589 from Deiz/fix-center 

Make center coordinates relative to current workspace
This commit is contained in:
Michael Stapelberg 2015-03-30 08:47:04 +02:00
parent aa8349a550 bae66a9dae
commit 9718640622
2 changed files with 65 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/commands.c
View File

@ -1776,8 +1776,8 @@ void cmd_move_window_to_center(I3_CMD, char *method) {
Rect newrect = focused->parent->rect;
DLOG("moving to center\n");
newrect.x = wsrect->width / 2 - newrect.width / 2;
newrect.y = wsrect->height / 2 - newrect.height / 2;
newrect.x = wsrect->x + wsrect->width / 2 - newrect.width / 2;
newrect.y = wsrect->y + wsrect->height / 2 - newrect.height / 2;
floating_reposition(focused->parent, newrect);
}

63
testcases/t/523-move-position-center.t Normal file
View File

@ -0,0 +1,63 @@
#!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)
#
# Verifies that 'move position center' moves floating cons to the center of
# the appropriate output.
# Ticket: #1211
# Bug still in: 4.9.1-108-g037cb31
use i3test i3_autostart => 0;
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1024x768+0+0,1024x768+1024+0
workspace left output fake-0
workspace right output fake-1
EOT
my $pid = launch_with_config($config);
#####################################################################
# Verify that 'move position center' on a floating window does not
# move it to another output.
#####################################################################
cmd 'workspace left';
# Sync in case focus switched outputs due to the workspace change.
sync_with_i3;
my $floating = open_floating_window;
# Center the window on the left workspace
cmd 'move position center';
sync_with_i3;
is(scalar @{get_ws('left')->{floating_nodes}}, 1, 'one floating node on left ws');
is(scalar @{get_ws('right')->{floating_nodes}}, 0, 'no floating nodes on right ws');
# Center the window on the right workspace
cmd 'move workspace right; workspace right; move position center';
sync_with_i3;
is(scalar @{get_ws('left')->{floating_nodes}}, 0, 'no floating nodes on left ws');
is(scalar @{get_ws('right')->{floating_nodes}}, 1, 'one floating node on right ws');
exit_gracefully($pid);
done_testing;