sway

commit 53fe7b02e9787e8a08dbc4d132e8bde836647a9e
parent 602ccca1a86a6a8611a287a09feeade17bccfa7c
Author: Ryan Dwyer <ryandwyer1@gmail.com>
Date:   Wed, 29 Aug 2018 10:38:46 +1000

Fix workspace tabs

When collecting focus to save into the transaction state, the workspace
needs to look in the tiling list only.

As seat_get_focus_inactive_tiling returns any descendant, the list also
needs to be traversed back up to the direct child of the workspace.

Fixes #2532

Diffstat:
M
sway/desktop/transaction.c
 | 
12
+++++++++++-

1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c
@@ -122,7 +122,17 @@ static void copy_pending_state(struct sway_container *container,
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
 	state->focused = seat_get_focus(seat) == container;
 
-	if (container->type != C_VIEW) {
+	if (container->type == C_WORKSPACE) {
+		// Set focused_inactive_child to the direct tiling child
+		struct sway_container *focus =
+			seat_get_focus_inactive_tiling(seat, container);
+		if (focus && focus->type == C_CONTAINER) {
+			while (focus->parent->type != C_WORKSPACE) {
+				focus = focus->parent;
+			}
+		}
+		state->focused_inactive_child = focus;
+	} else if (container->type != C_VIEW) {
 		state->focused_inactive_child =
 			seat_get_active_child(seat, container);
 	}