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

Prefer fullscreen floating containers when on directional focus 

Fixes #3201
next
Orestis Floros 2018-03-25 14:25:20 +03:00
parent b849fe3e44
commit 37106aa84b
No known key found for this signature in database
GPG Key ID: E9AD9F32E401E38F
2 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/tree.c
View File

@ -567,9 +567,16 @@ static bool _tree_next(Con *con, char way, orientation_t orientation, bool wrap)
if (!workspace)
return false;
Con *focus = con_descend_tiling_focused(workspace);
if (focus == workspace) {
focus = con_descend_focused(workspace);
/* Use descend_focused first to give higher priority to floating or
* tiling fullscreen containers. */
Con *focus = con_descend_focused(workspace);
if (focus->fullscreen_mode == CF_NONE) {
Con *focus_tiling = con_descend_tiling_focused(workspace);
/* If descend_tiling returned a workspace then focus is either a
* floating container or the same workspace. */
if (focus_tiling != workspace) {
focus = focus_tiling;
}
}
workspace_show(workspace);

40
testcases/t/296-regress-focus-behind-fullscreen-floating.t Normal file
View File

@ -0,0 +1,40 @@
#!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)
#
# Test that directional focus gives focus to floating fullscreen containers when
# switching workspaces.
# Ticket: #3201
# Bug still in: 4.15-59-gb849fe3e
use i3test i3_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
EOT
fresh_workspace(output => 0);
my $ws = fresh_workspace(output => 1);
open_window;
open_floating_window;
cmd 'fullscreen enable';
my $expected_focus = get_focused($ws);
cmd 'focus left';
cmd 'focus right';
is (get_focused($ws), $expected_focus, 'floating fullscreen window focused after directional focus');
done_testing;