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

Bugfix: 'level up' needs to stop at the workspace con + testcase (Thanks mseed)

This commit is contained in:
Michael Stapelberg 2011-03-03 14:30:13 +01:00
parent 62362a464d
commit a038d2674b
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tree.c
View File

@ -268,8 +268,9 @@ void tree_split(Con *con, orientation_t orientation) {
*/
void level_up() {
/* We can focus up to the workspace, but not any higher in the tree */
if (focused->parent->type != CT_CON &&
focused->parent->type != CT_WORKSPACE) {
if ((focused->parent->type != CT_CON &&
focused->parent->type != CT_WORKSPACE) ||
focused->type == CT_WORKSPACE) {
printf("cannot go up\n");
return;
}

21
testcases/t/52-regress-level-up.t Normal file
View File

@ -0,0 +1,21 @@
#!perl
# vim:ts=4:sw=4:expandtab
#
# Regression test for using level-up to get to the 'content'-container and
# toggle floating
#
use Time::HiRes qw(sleep);
use i3test;
my $tmp = get_unused_workspace;
cmd "workspace $tmp";
cmd 'open';
cmd 'level up';
cmd 'level up';
cmd 'mode toggle';
does_i3_live;
done_testing;