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

Fix switching to a workspace on a different output

This commit is contained in:
Michael Stapelberg 2011-01-08 12:03:03 +01:00
parent d5388147f1
commit a6f0dcd250
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/workspace.c
View File

@ -211,14 +211,17 @@ void workspace_show(const char *num) {
current->fullscreen_mode = CF_NONE; current->fullscreen_mode = CF_NONE;
} }
/* Check if the the currently focused con is on the same Output as the
* workspace we chose as 'old'. If not, use the workspace of the currently
* focused con */
if (con_get_workspace(focused)->parent != old->parent)
old = con_get_workspace(focused);
/* enable fullscreen for the target workspace. If it happens to be the /* enable fullscreen for the target workspace. If it happens to be the
* same one we are currently on anyways, we can stop here. */ * same one we are currently on anyways, we can stop here. */
workspace->fullscreen_mode = CF_OUTPUT; workspace->fullscreen_mode = CF_OUTPUT;
if (workspace == old) if (workspace == old)
return; return;
/* disable fullscreen */
TAILQ_FOREACH(current, &(workspace->parent->nodes_head), nodes)
current->fullscreen_mode = CF_NONE;
workspace_reassign_sticky(workspace); workspace_reassign_sticky(workspace);