alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix workspace tabs

Browse source 
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
This commit is contained in:
Ryan Dwyer 2018-08-29 10:38:46 +10:00
parent 602ccca1a8
commit 53fe7b02e9
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sway/desktop/transaction.c
View file

@ -122,7 +122,17 @@ static void copy_pending_state(struct sway_container *container,
struct sway_seat *seat = input_manager_current_seat(input_manager); struct sway_seat *seat = input_manager_current_seat(input_manager);
state->focused = seat_get_focus(seat) == container; 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 = state->focused_inactive_child =
seat_get_active_child(seat, container); seat_get_active_child(seat, container);
} }