diff options
| author | William McKinnon <[email protected]> | 2022-04-26 21:44:51 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-04-26 21:44:51 -0400 |
| commit | 4660771f6a25b93062df0698634059f893ae1999 (patch) | |
| tree | b7135d20119a42d8381fb65004f476750d6212fd /sway/commands/focus.c | |
| parent | ccda4dae0f9b77b9760d6fdf178e0f0e2571cde0 (diff) | |
| parent | 5543acff06981639086bc9a0fc9b608796a23e84 (diff) | |
Merge pull request #1 from swaywm/v1.7
V1.7
Diffstat (limited to 'sway/commands/focus.c')
| -rw-r--r-- | sway/commands/focus.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sway/commands/focus.c b/sway/commands/focus.c index 6771ca2f..b8d28480 100644 --- a/sway/commands/focus.c +++ b/sway/commands/focus.c @@ -267,6 +267,11 @@ static struct cmd_results *focus_mode(struct sway_workspace *ws, new_focus = seat_get_focus_inactive_tiling(seat, ws); } if (new_focus) { + struct sway_container *new_focus_view = + seat_get_focus_inactive_view(seat, &new_focus->node); + if (new_focus_view) { + new_focus = new_focus_view; + } seat_set_focus_container(seat, new_focus); // If we're on the floating layer and the floating container area @@ -446,7 +451,8 @@ struct cmd_results *cmd_focus(int argc, char **argv) { return cmd_results_new(CMD_FAILURE, ""); } struct sway_node *next_focus = NULL; - if (container_is_floating(container)) { + if (container_is_floating(container) && + container->pending.fullscreen_mode == FULLSCREEN_NONE) { next_focus = node_get_in_direction_floating(container, seat, direction); } else { next_focus = node_get_in_direction_tiling(container, seat, direction, descend); |