aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-09-05 20:39:13 -0400
committerGitHub <noreply@github.com>2018-09-05 20:39:13 -0400
commit85e95d5825cdd24cc9a3c8efc2078c414300a8af (patch)
tree5c0c1e8399a738a27fbe3a7805af75650aa142a8
parent49c937fc878da3ffb155429216ad8298202f1767 (diff)
parent5cc70d1dfdc891e99f6759869cc9272f1429ec16 (diff)
Merge pull request #2580 from RyanDwyer/fix-focus-after-fullscreen
Restore focus correctly when closing a fullscreen view
-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) {
// the structure change might have caused it to move up to the top of
// the focus stack without sending focus notifications to the view
- if (seat_get_focus(seat) == next_focus) {
- seat_send_focus(next_focus, seat);
- } else {
- seat_set_focus(seat, next_focus);
- }
+ seat_send_focus(next_focus, seat);
+ seat_set_focus(seat, next_focus);
}
}