Respect dont_warp flag when moving containers (#2867)

fixes #2681
fixes #2592
This commit is contained in:
Michael Stapelberg
2017-08-20 17:07:23 +02:00
committed by GitHub
parent fdb551f9d5
commit 260bcf283f
2 changed files with 67 additions and 1 deletions

View File

@ -1105,8 +1105,13 @@ static bool _con_move_to_con(Con *con, Con *target, bool behind_focused, bool fi
/* Descend focus stack in case focus_next is a workspace which can
* occur if we move to the same workspace. Also show current workspace
* to ensure it is focused. */
if (!ignore_focus)
if (!ignore_focus) {
workspace_show(current_ws);
if (dont_warp) {
DLOG("x_set_warp_to(NULL) because dont_warp is set\n");
x_set_warp_to(NULL);
}
}
/* Set focus only if con was on current workspace before moving.
* Otherwise we would give focus to some window on different workspace. */