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

Merge pull request #2980 from orestisf1993/issue-1160-pr

Browse Source 
Use con_descend_focused for workspaces in _tree_next
This commit is contained in:
Ingo Bürk
2017-11-05 17:42:31 +01:00
committed by GitHub
parent b18f507b9b af78331ee7
commit c207921949
2 changed files with 98 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/tree.c
View File

@ -560,21 +560,10 @@ static bool _tree_next(Con *con, char way, orientation_t orientation, bool wrap)
if (!workspace)
return false;
workspace_show(workspace);
/* If a workspace has an active fullscreen container, one of its
* children should always be focused. The above workspace_show()
* should be adequate for that, so return. */
if (con_get_fullscreen_con(workspace, CF_OUTPUT))
return true;
Con *focus = con_descend_direction(workspace, direction);
/* special case: if there was no tiling con to focus and the workspace
* has a floating con in the focus stack, focus the top of the focus
* stack (which may be floating) */
if (focus == workspace)
Con *focus = con_descend_tiling_focused(workspace);
if (focus == workspace) {
focus = con_descend_focused(workspace);
}
if (focus) {
con_focus(focus);