Merge branch 'master' into edge-borders

This commit is contained in:
Brian Ashworth 2018-05-12 12:43:34 -04:00 committed by GitHub
commit ec60e24f75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 1081 additions and 1559 deletions

View file

@ -199,13 +199,15 @@ void view_set_fullscreen_raw(struct sway_view *view, bool fullscreen) {
struct sway_container *focus, *focus_ws;
wl_list_for_each(seat, &input_manager->seats, link) {
focus = seat_get_focus(seat);
focus_ws = focus;
if (focus_ws->type != C_WORKSPACE) {
focus_ws = container_parent(focus_ws, C_WORKSPACE);
}
seat_set_focus(seat, view->swayc);
if (focus_ws != workspace) {
seat_set_focus(seat, focus);
if (focus) {
focus_ws = focus;
if (focus && focus_ws->type != C_WORKSPACE) {
focus_ws = container_parent(focus_ws, C_WORKSPACE);
}
seat_set_focus(seat, view->swayc);
if (focus_ws != workspace) {
seat_set_focus(seat, focus);
}
}
}
} else {