applications/i3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix: tree_split should not split floating cons

Browse Source 
Use the more robust test of `con_is_floating` for testing a container
for being floating.

fixes #1177
This commit is contained in:
Tony Crisci 2014-02-07 10:07:56 -05:00 committed by Michael Stapelberg
parent 1bd13ce555
commit 6ae4ecb1de
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tree.c
View File

@ -387,7 +387,7 @@ void tree_close_con(kill_window_t kill_window) {
*
*/
void tree_split(Con *con, orientation_t orientation) {
if (con->type == CT_FLOATING_CON) {
if (con_is_floating(con)) {
DLOG("Floating containers can't be split.\n");
return;
}

35
testcases/t/218-regress-floating-split.t Normal file
View File

@ -0,0 +1,35 @@
#!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)
#
# Make sure floating containers really can't be split.
# Ticket: #1177
# Bug still in: 4.7.2-81-g905440d
use i3test;
my $ws = fresh_workspace;
my $window = open_floating_window;
cmd "layout stacked";
cmd "splitv";
my $floating_con = get_ws($ws)->{floating_nodes}[0]->{nodes}[0];
is(@{$floating_con->{nodes}}, 0, 'floating con is still a leaf');
cmd 'floating disable';
does_i3_live;
done_testing;