aboutsummaryrefslogtreecommitdiff
path: root/sway/input/seat.c
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-08-07 09:30:27 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-08-08 08:48:20 +1000
commita0649190deaaf093112e99881c25ff550f07e96b (patch)
tree922fc56dad707ceeebaf6ea3364751e51d764407 /sway/input/seat.c
parent36281609ea882d4c0a2a10fc9e604eb1ec2e8951 (diff)
Fix edge cases when moving floating container to new workspace
* Removes container_floating_move_to_container, instead opting to put that logic in container_move_to * In the seat code, focusing a floating view now updates the pending state only and lets the next transaction carry it over to the current state. This is required, otherwise it would crash. * When unfullscreening a floating container, an output check is now done to see if it should center it.
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