aboutsummaryrefslogtreecommitdiff
path: root/sway/input/seat.c
diff options
context:
space:
mode:
authorBrian Ashworth <RedSoxFan@users.noreply.github.com>2018-08-08 15:26:44 -0400
committerGitHub <noreply@github.com>2018-08-08 15:26:44 -0400
commit3c26536267e13859eb6088ce0192579f10ac871f (patch)
treea4676629358071b0f0748dde33a32d82c9a58175 /sway/input/seat.c
parent776b9b7e1fa72ebc4f7e79de280ea5dd9901787e (diff)
parente28101e6e1ed757fe8a7402c5123ee7e58546895 (diff)
Merge branch 'master' into master
Diffstat (limited to 'sway/input/seat.c')
-rw-r--r--sway/input/seat.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c
index dd4d5c3b..6dd7cf7d 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -717,12 +717,8 @@ void seat_set_focus_warp(struct sway_seat *seat,
// If we've focused a floating container, bring it to the front.
// We do this by putting it at the end of the floating list.
- // This must happen for both the pending and current children lists.
if (container && container_is_floating(container)) {
list_move_to_end(container->parent->children, container);
- if (container_has_ancestor(container, container->current.parent)) {
- list_move_to_end(container->parent->current.children, container);
- }
}
// clean up unfocused empty workspace on new output