diff options
| author | Drew DeVault <[email protected]> | 2019-01-27 18:06:50 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-01-27 18:06:50 -0500 |
| commit | 783fadab284c79c8e13625e5e2a2eefae02c75d3 (patch) | |
| tree | 795c5c69a7fcfc9336115ac157a41b943190f206 /sway/desktop/render.c | |
| parent | 897250c65fb4d7123361dc6f77c2824179ed8885 (diff) | |
| parent | 20aa8ee67dc528299dbc8735220a1c081c7ff9f6 (diff) | |
Merge pull request #3423 from RyanDwyer/fullscreen-global
Implement fullscreen global
Diffstat (limited to 'sway/desktop/render.c')
| -rw-r--r-- | sway/desktop/render.c | 10 |
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}; |