commands/focus: focus view inside container

seat_get_focus_inactive_floating and seat_get_focus_inactive_tiling do
not always return a view, so get the previously focused view from the
container with seat_get_focus_inactive_view. This is the i3 behavior.

1 files changed, 5 insertions, 0 deletions

diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index 6771ca2f..ceb43d45 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