mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restore focus when unmapping layer shell surfaces

This commit is contained in:
Ryan Dwyer 2018-06-04 11:31:07 +10:00
parent 74799937cf
commit 9253278328
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sway/desktop/layer_shell.c
View File

@ -257,6 +257,11 @@ static void unmap(struct sway_layer_surface *sway_layer) {
}
output_damage_surface(output, sway_layer->geo.x, sway_layer->geo.y,
sway_layer->layer_surface->surface, true);
struct sway_seat *seat = input_manager_current_seat(input_manager);
if (seat->focused_layer == sway_layer->layer_surface) {
seat_set_focus_layer(seat, NULL);
}
}
static void handle_destroy(struct wl_listener *listener, void *data) {

3
sway/input/seat.c
View File

@ -658,7 +658,8 @@ void seat_set_focus_layer(struct sway_seat *seat,
struct wlr_layer_surface *layer) {
if (!layer && seat->focused_layer) {
seat->focused_layer = NULL;
struct sway_container *previous = seat_get_focus(seat);
struct sway_container *previous =
seat_get_focus_inactive(seat, &root_container);
if (previous) {
wlr_log(L_DEBUG, "Returning focus to %p %s '%s'", previous,
container_type_to_str(previous->type), previous->name);