alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Refocus the last focused container on lock exit

Browse source
This commit is contained in:
Drew DeVault 2018-04-03 15:42:32 -04:00
parent 62a736a196
commit 3ede718c06
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sway/input/seat.c
View file

@ -424,11 +424,18 @@ void seat_set_focus(struct sway_seat *seat,
void seat_set_focus_layer(struct sway_seat *seat, void seat_set_focus_layer(struct sway_seat *seat,
struct wlr_layer_surface *layer) { struct wlr_layer_surface *layer) {
if (!layer) { if (!layer && seat->focused_layer) {
seat->focused_layer = NULL; seat->focused_layer = NULL;
return; struct sway_container *c = seat_get_focus(seat);
if (c) {
wlr_log(L_DEBUG, "Returning focus to %p %s '%s'", c,
container_type_to_str(c->type), c->name);
// Hack to get seat to re-focus the return value of get_focus
seat_set_focus(seat, c->parent);
seat_set_focus(seat, c);
} }
if (seat->focused_layer == layer) { return;
} else if (!layer || seat->focused_layer == layer) {
return; return;
} }
if (seat->has_focus) { if (seat->has_focus) {