Don't restore focus if unmapping surface wasn't focused

master
Ryan Dwyer 7 years ago
parent bcdb676abb
commit 1206a60977

@ -79,8 +79,10 @@ static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) {
wl_list_remove(&surface->commit.link); wl_list_remove(&surface->commit.link);
if (!wlr_xwayland_surface_is_unmanaged(xsurface)) { if (!wlr_xwayland_surface_is_unmanaged(xsurface)) {
// Restore focus
struct sway_seat *seat = input_manager_current_seat(input_manager); struct sway_seat *seat = input_manager_current_seat(input_manager);
if (seat->wlr_seat->keyboard_state.focused_surface ==
xsurface->surface) {
// Restore focus
struct sway_container *previous = struct sway_container *previous =
seat_get_focus_inactive(seat, &root_container); seat_get_focus_inactive(seat, &root_container);
if (previous) { if (previous) {
@ -89,6 +91,7 @@ static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) {
seat_set_focus(seat, previous); seat_set_focus(seat, previous);
} }
} }
}
} }
static void unmanaged_handle_destroy(struct wl_listener *listener, void *data) { static void unmanaged_handle_destroy(struct wl_listener *listener, void *data) {

Loading…
Cancel
Save