Skip to content

Commit

Permalink
Use con_descend_focused for workspaces in _tree_next
Browse files Browse the repository at this point in the history
  • Loading branch information
orestisfl committed Sep 24, 2017
1 parent 9fe508b commit 4a920e4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 155 deletions.
16 changes: 1 addition & 15 deletions src/tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -560,21 +560,7 @@ 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)
focus = con_descend_focused(workspace);
Con *focus = con_descend_focused(workspace);

if (focus) {
con_focus(focus);
Expand Down
140 changes: 0 additions & 140 deletions testcases/t/510-focus-across-outputs.t

This file was deleted.

0 comments on commit 4a920e4

Please sign in to comment.