summaryrefslogtreecommitdiffstats
path: root/sway
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-09-06 09:33:37 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-09-06 09:33:37 +1000
commit5cc70d1dfdc891e99f6759869cc9272f1429ec16 (patch)
tree5c0c1e8399a738a27fbe3a7805af75650aa142a8 /sway
parentMerge pull request #2572 from RedSoxFan/wlr-output-disabling (diff)
downloadsway-5cc70d1dfdc891e99f6759869cc9272f1429ec16.tar.gz
sway-5cc70d1dfdc891e99f6759869cc9272f1429ec16.tar.zst
sway-5cc70d1dfdc891e99f6759869cc9272f1429ec16.zip
Restore focus correctly when closing a fullscreen view
We weren't calling seat_send_focus. I think this was previously called by seat_set_focus_warp.
Diffstat (limited to 'sway')
-rw-r--r--sway/input/seat.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 92d9d7ec..b1808793 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -168,11 +168,8 @@ static void handle_seat_node_destroy(struct wl_listener *listener, void *data) {
168 168
169 // the structure change might have caused it to move up to the top of 169 // the structure change might have caused it to move up to the top of
170 // the focus stack without sending focus notifications to the view 170 // the focus stack without sending focus notifications to the view
171 if (seat_get_focus(seat) == next_focus) { 171 seat_send_focus(next_focus, seat);
172 seat_send_focus(next_focus, seat); 172 seat_set_focus(seat, next_focus);
173 } else {
174 seat_set_focus(seat, next_focus);
175 }
176 } 173 }
177} 174}
178 175