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

Merge pull request #3486 from orestisf1993/regress-move-floating 

Fix regression with moving floating windows
This commit is contained in:
Ingo Bürk 2018-10-29 14:59:25 +01:00 committed by GitHub
parent 04d1fcbe2d 64c493ef1f
commit f16afef7b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/con.c
View File

@ -1234,14 +1234,12 @@ static bool _con_move_to_con(Con *con, Con *target, bool behind_focused, bool fi
Con *old_focus = focused; Con *old_focus = focused;
con_activate(con_descend_focused(con)); con_activate(con_descend_focused(con));
/* Restore focus if the output's focused workspace has changed. */
if (con_get_workspace(focused) != old_focus_ws) {
con_focus(old_focus);
}
/* Restore focus to the currently focused container. */
if (old_focus_ws == current_ws && old_focus->type != CT_WORKSPACE) { if (old_focus_ws == current_ws && old_focus->type != CT_WORKSPACE) {
/* Restore focus to the currently focused container. */
con_activate(old_focus); con_activate(old_focus);
} else if (con_get_workspace(focused) != old_focus_ws) {
/* Restore focus if the output's focused workspace has changed. */
con_focus(con_descend_focused(old_focus_ws));
} }
} }