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

bugfix: Resize and center a scratchpad even when a criteria is used.

This commit is contained in:
Franck Michea 2013-07-10 22:18:18 +02:00 committed by Michael Stapelberg
parent 023594909e
commit 1f8a860744
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/scratchpad.c
View File

@ -175,6 +175,10 @@ void scratchpad_show(Con *con) {
LOG("Use 'move scratchpad' to move a window to the scratchpad.\n"); LOG("Use 'move scratchpad' to move a window to the scratchpad.\n");
return; return;
} }
} else {
/* We used a criterion, so we need to do what follows (moving,
* resizing) on the floating parent. */
con = con_inside_floating(con);
} }
/* 1: Move the window from __i3_scratch to the current workspace. */ /* 1: Move the window from __i3_scratch to the current workspace. */

18
testcases/t/202-scratchpad-criteria.t
View File

@ -17,6 +17,8 @@
# Verifies that using criteria to address scratchpad windows works. # Verifies that using criteria to address scratchpad windows works.
use i3test; use i3test;
my $i3 = i3(get_socket_path());
##################################################################### #####################################################################
# Verify that using scratchpad show with criteria works as expected: # Verify that using scratchpad show with criteria works as expected:
# - When matching a scratchpad window which is visible, # - When matching a scratchpad window which is visible,
@ -51,6 +53,22 @@ cmd '[title="scratch-match"] scratchpad show';
my $scratch_focus = get_focused($tmp); my $scratch_focus = get_focused($tmp);
isnt($scratch_focus, $old_focus, 'matching criteria works'); isnt($scratch_focus, $old_focus, 'matching criteria works');
# Check that the window was centered and resized too.
my $tree = $i3->get_tree->recv;
my $ws = get_ws($tmp);
my $scratchrect = $ws->{floating_nodes}->[0]->{rect};
my $output = $tree->{nodes}->[1];
my $outputrect = $output->{rect};
is($scratchrect->{width}, $outputrect->{width} * 0.5, 'scratch width is 50%');
is($scratchrect->{height}, $outputrect->{height} * 0.75, 'scratch height is 75%');
is($scratchrect->{x},
($outputrect->{width} / 2) - ($scratchrect->{width} / 2),
'scratch window centered horizontally');
is($scratchrect->{y},
($outputrect->{height} / 2 ) - ($scratchrect->{height} / 2),
'scratch window centered vertically');
cmd '[title="scratch-match"] scratchpad show'; cmd '[title="scratch-match"] scratchpad show';
isnt(get_focused($tmp), $scratch_focus, 'matching criteria works'); isnt(get_focused($tmp), $scratch_focus, 'matching criteria works');