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

Merge pull request #3403 from orestisf1993/issue-3402 

_con_move_to_con: Move upwards only on CT_FLOATING_CON
This commit is contained in:
Ingo Bürk 2018-09-14 15:17:13 +02:00 committed by GitHub
parent c7132ec5b0 d407393d0d
commit 18f705a978
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/con.c
View File

@ -1171,13 +1171,13 @@ static bool _con_move_to_con(Con *con, Con *target, bool behind_focused, bool fi
target = target->parent;
}
/* 3: if the target container is floating, we get the workspace instead.
* Only tiling windows need to get inserted next to the current container.
* */
Con *floatingcon = con_inside_floating(target);
if (floatingcon != NULL) {
/* 3: if the original target is the direct child of a floating container, we
* can't move con next to it - floating containers have only one child - so
* we get the workspace instead. */
if (target->type == CT_FLOATING_CON) {
DLOG("floatingcon, going up even further\n");
target = floatingcon->parent;
orig_target = target;
target = target->parent;
}
if (con->type == CT_FLOATING_CON) {

21
testcases/t/243-move-to-mark.t
View File

@ -321,6 +321,27 @@ sync_with_i3;
($nodes, $focus) = get_ws_content($target_ws);
is(@{$nodes}, 1, 'tiling container moved to the target workspace');
###############################################################################
# Given 'S' and 'M' where 'M' is inside a floating container but not its direct
# child, when 'S' is moved to 'M', i3 should not crash.
# See issue: #3402
###############################################################################
$target_ws = fresh_workspace;
$S = open_window;
open_window;
cmd 'splitv';
$M = open_window;
cmd 'mark target';
cmd 'focus parent, floating enable, focus child';
cmd '[id="' . $S->{id} . '"] move container to mark target';
does_i3_live;
# Note: this is not actively supported behavior.
$nodes = get_ws($target_ws)->{floating_nodes}->[0]->{nodes}->[0]->{nodes};
is(1, (grep { $_->{window} == $S->{id} } @{$nodes}), 'tiling container moved inside floating container');
###############################################################################
# Given 'S' and 'M' are the same container, when 'S' is moved to 'M', then
# the command is ignored.