aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-10-17 17:50:51 +0200
committerGitHub <noreply@github.com>2018-10-17 17:50:51 +0200
commit5893b197ba8bec9536ee17420171c82c1cd7a54c (patch)
treeaf72b565ab5bdb19f3b93ecee7560fe0526a9573
parentaffc83ff82d03ef0804936f637291a2575efcce1 (diff)
parent175ccc25179f75f20bd618172ae8156e137c3615 (diff)
Merge pull request #1316 from agx/fullscreen-vs-layershell
rootston: Don't let the wlr_output handle the fullscreen view in caseā€¦
-rw-r--r--rootston/output.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/rootston/output.c b/rootston/output.c
index 9d376f8e..bd38f3ab 100644
--- a/rootston/output.c
+++ b/rootston/output.c
@@ -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);