Merge pull request #3423 from RyanDwyer/fullscreen-global

Implement fullscreen global

1 files changed, 9 insertions, 1 deletions

diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index a38c6a07..fa27500e 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -985,7 +985,15 @@ void output_render(struct sway_output *output, struct timespec *when,
                 goto render_overlay;
         }
 
-        struct sway_container *fullscreen_con = workspace->current.fullscreen;
+        struct sway_container *fullscreen_con = root->fullscreen_global;
+        if (fullscreen_con && fullscreen_con->scratchpad &&
+                        !fullscreen_con->workspace) {
+                fullscreen_con = NULL;
+        }
+        if (!fullscreen_con) {
+                fullscreen_con = workspace->current.fullscreen;
+        }
+
         if (fullscreen_con) {
                 float clear_color[] = {0.0f, 0.0f, 0.0f, 1.0f};