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

Merge pull request #3363 from orestisf1993/regress-scratchpad-focus 

Call con_activate after moving scratchpad window to current ws
This commit is contained in:
Ingo Bürk 2018-08-17 11:42:29 +02:00 committed by GitHub
parent 4b3ff9cdd4 cac28b69d4
commit 2d3c2f0615
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/scratchpad.c
View File

@ -141,6 +141,7 @@ bool scratchpad_show(Con *con) {
DLOG("Found a visible scratchpad window on another workspace,\n");
DLOG("moving it to this workspace: con = %p\n", walk_con);
con_move_to_workspace(walk_con, focused_ws, true, false, false);
con_activate(con_descend_focused(walk_con));
return true;
}
}

33
testcases/t/299-regress-scratchpad-focus.t Normal file
View File

@ -0,0 +1,33 @@
#!perl
# vim:ts=4:sw=4:expandtab
#
# Please read the following documents before working on tests:
# • https://build.i3wm.org/docs/testsuite.html
# (or docs/testsuite)
#
# • https://build.i3wm.org/docs/lib-i3test.html
# (alternatively: perldoc ./testcases/lib/i3test.pm)
#
# • https://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)
#
# Regression test: verify that a scratchpad container that was open in another
# workspace and is moved to the current workspace after a 'scratchpad show' is
# focused.
# Ticket: #3361
# Bug still in: 4.15-190-g4b3ff9cd
use i3test;
my $expected_focus = open_window;
cmd 'move to scratchpad';
cmd 'scratchpad show';
my $ws = fresh_workspace;
open_window;
cmd 'scratchpad show';
sync_with_i3;
is($x->input_focus, $expected_focus->id, 'scratchpad window brought from other workspace is focused');
done_testing;