Merge pull request #1316 from agx/fullscreen-vs-layershell

rootston: Don't let the wlr_output handle the fullscreen view in case…
This commit is contained in:
Drew DeVault 2018-10-17 17:50:51 +02:00 committed by GitHub
commit 5893b197ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -459,7 +459,8 @@ static void render_output(struct roots_output *output) {
output_box->y;
view_move(view, view_x, view_y);
if (has_standalone_surface(view)) {
if (has_standalone_surface(view) &&
wl_list_empty(&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY])) {
wlr_output_set_fullscreen_surface(wlr_output, view->wlr_surface);
} else {
wlr_output_set_fullscreen_surface(wlr_output, NULL);