Merge pull request #4012 from orestisfl/floating_maybe_reassign_ws_focus
floating_maybe_reassign_ws: only re-focus if previously focused
This commit is contained in:
commit
93bb2022bb
|
@ -514,9 +514,15 @@ bool floating_maybe_reassign_ws(Con *con) {
|
||||||
Con *content = output_get_content(output->con);
|
Con *content = output_get_content(output->con);
|
||||||
Con *ws = TAILQ_FIRST(&(content->focus_head));
|
Con *ws = TAILQ_FIRST(&(content->focus_head));
|
||||||
DLOG("Moving con %p / %s to workspace %p / %s\n", con, con->name, ws, ws->name);
|
DLOG("Moving con %p / %s to workspace %p / %s\n", con, con->name, ws, ws->name);
|
||||||
|
Con *needs_focus = con_descend_focused(con);
|
||||||
|
if (!con_inside_focused(needs_focus)) {
|
||||||
|
needs_focus = NULL;
|
||||||
|
}
|
||||||
con_move_to_workspace(con, ws, false, true, false);
|
con_move_to_workspace(con, ws, false, true, false);
|
||||||
workspace_show(ws);
|
if (needs_focus) {
|
||||||
con_activate(con_descend_focused(con));
|
workspace_show(ws);
|
||||||
|
con_activate(needs_focus);
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue