aboutsummaryrefslogtreecommitdiffstats
path: root/sway/desktop/transaction.c
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-08-29 14:38:51 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-08-29 14:38:51 +1000
commit3c4196b986f2781e6a72a8e230b653b73c67159b (patch)
treee25b81fc431059554c90c65376181b5b08f35145 /sway/desktop/transaction.c
parentMerge pull request #2535 from RyanDwyer/fix-reap-crash (diff)
downloadsway-3c4196b986f2781e6a72a8e230b653b73c67159b.tar.gz
sway-3c4196b986f2781e6a72a8e230b653b73c67159b.tar.zst
sway-3c4196b986f2781e6a72a8e230b653b73c67159b.zip
Fix rendering of nested tabs
The C_CONTAINER check needs to apply to C_VIEW as well.
Diffstat (limited to 'sway/desktop/transaction.c')
-rw-r--r--sway/desktop/transaction.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c
index 862ffee8..fdf24bd3 100644
--- a/sway/desktop/transaction.c
+++ b/sway/desktop/transaction.c
@@ -126,7 +126,7 @@ static void copy_pending_state(struct sway_container *container,
126 // Set focused_inactive_child to the direct tiling child 126 // Set focused_inactive_child to the direct tiling child
127 struct sway_container *focus = 127 struct sway_container *focus =
128 seat_get_focus_inactive_tiling(seat, container); 128 seat_get_focus_inactive_tiling(seat, container);
129 if (focus && focus->type == C_CONTAINER) { 129 if (focus && focus->type > C_WORKSPACE) {
130 while (focus->parent->type != C_WORKSPACE) { 130 while (focus->parent->type != C_WORKSPACE) {
131 focus = focus->parent; 131 focus = focus->parent;
132 } 132 }