koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
Conflicts:
	src/con.c
This commit is contained in:
Michael Stapelberg
2012-01-07 18:21:12 +00:00
parent 0e1b1dd984 313a700e86
commit 6345124049
2 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/con.c
View File

@ -656,8 +656,11 @@ void con_move_to_workspace(Con *con, Con *workspace, bool fix_coordinates, bool
con_fix_percent(next);
/* 7: focus the con on the target workspace (the X focus is only updated by
* calling tree_render(), so for the "real" focus this is a no-op). */
if (workspace->name[0] != '_' || workspace->name[1] != '_')
* calling tree_render(), so for the "real" focus this is a no-op).
* We don’t focus the con for i3 pseudo workspaces like __i3_scratch and
* we don’t focus when there is a fullscreen con on that workspace. */
if ((workspace->name[0] != '_' || workspace->name[1] != '_') &&
con_get_fullscreen_con(workspace, CF_OUTPUT) == NULL)
con_focus(con_descend_focused(con));
/* 8: when moving to a visible workspace on a different output, we keep the