aboutsummaryrefslogtreecommitdiff
path: root/sway/tree/root.c
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2019-01-25 08:29:21 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2019-01-25 08:29:21 +1000
commit20aa8ee67dc528299dbc8735220a1c081c7ff9f6 (patch)
tree685de48be3db51fc01510ccf051e2b63a4655fba /sway/tree/root.c
parent75406bb93b96091d30e52922d0f319530fe65471 (diff)
Implement fullscreen global
Diffstat (limited to 'sway/tree/root.c')
-rw-r--r--sway/tree/root.c5
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