diff options
| author | Drew DeVault <sir@cmpwn.com> | 2019-01-27 18:06:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-27 18:06:50 -0500 |
| commit | 783fadab284c79c8e13625e5e2a2eefae02c75d3 (patch) | |
| tree | 795c5c69a7fcfc9336115ac157a41b943190f206 /sway/tree/root.c | |
| parent | 897250c65fb4d7123361dc6f77c2824179ed8885 (diff) | |
| parent | 20aa8ee67dc528299dbc8735220a1c081c7ff9f6 (diff) | |
Merge pull request #3423 from RyanDwyer/fullscreen-global
Implement fullscreen global
Diffstat (limited to 'sway/tree/root.c')
| -rw-r--r-- | sway/tree/root.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sway/tree/root.c b/sway/tree/root.c index 99cf91a7..476e47a3 100644 --- a/sway/tree/root.c +++ b/sway/tree/root.c @@ -101,7 +101,10 @@ void root_scratchpad_show(struct sway_container *con) { // If the current con or any of its parents are in fullscreen mode, we // first need to disable it before showing the scratchpad con. if (new_ws->fullscreen) { - container_set_fullscreen(new_ws->fullscreen, false); + container_fullscreen_disable(new_ws->fullscreen); + } + if (root->fullscreen_global) { + container_fullscreen_disable(root->fullscreen_global); } // Show the container |