aboutsummaryrefslogtreecommitdiff
path: root/sway/input
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-09-16 14:04:25 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-09-16 21:57:19 +1000
commit48bc15e758c37e73f3eb6ae76f4ad758148dbfb1 (patch)
tree436c174b1ebd717d4c3fcd6e6507e224e2ea5690 /sway/input
parent31c6b5814f8725feb17f7819ea6951cf2c198327 (diff)
Make seat_get_active_child ignore floating children
seat_get_active_child is used to get the active tiling child in a few places, such as outputs getting their active workspace and tabbed/stacked containers getting their visible child. When a workspace uses a tabbed or stacked layout and contains a focused floating view, calling seat_get_active_child on the workspace would incorrectly return the floating view. This changes it so it will return the tiling child. This fixes the following bug: * Create layout T[view view] then float one of the views * Attempt to click the tiling view to give it focus - it wouldn't work because seat_get_active_child would return the floating view
Diffstat (limited to 'sway/input')
-rw-r--r--sway/input/seat.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c
index ab5047b2..6d02970d 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -888,9 +888,17 @@ struct sway_node *seat_get_active_child(struct sway_seat *seat,
struct sway_seat_node *current;
wl_list_for_each(current, &seat->focus_stack, link) {
struct sway_node *node = current->node;
- if (node_get_parent(node) == parent) {
- return node;
+ if (node_get_parent(node) != parent) {
+ continue;
}
+ if (parent->type == N_WORKSPACE) {
+ // Only consider tiling children
+ struct sway_workspace *ws = parent->sway_workspace;
+ if (list_find(ws->tiling, node->sway_container) == -1) {
+ continue;
+ }
+ }
+ return node;
}
return NULL;
}