From 9af0b4d2ea8ff3285077e9323172460d44cc27dc Mon Sep 17 00:00:00 2001 From: Sauyon Lee Date: Tue, 16 Jul 2019 11:47:44 +0100 Subject: [PATCH] Make fullscreen check for fullscreen parents This ensures that a child of a fullscreen container cannot be fullscreened. --- sway/commands/fullscreen.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sway/commands/fullscreen.c b/sway/commands/fullscreen.c index a268ba034..0d7ba112f 100644 --- a/sway/commands/fullscreen.c +++ b/sway/commands/fullscreen.c @@ -33,8 +33,15 @@ struct cmd_results *cmd_fullscreen(int argc, char **argv) { } } - bool is_fullscreen = container && - container->fullscreen_mode != FULLSCREEN_NONE; + bool is_fullscreen = false; + for (struct sway_container *curr = container; curr; curr = curr->parent) { + if (curr && curr->fullscreen_mode != FULLSCREEN_NONE) { + container = curr; + is_fullscreen = true; + break; + } + } + bool global = false; bool enable = !is_fullscreen;