diff options
author | Sauyon Lee <s@uyon.co> | 2019-07-16 11:47:44 +0100 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2019-07-17 09:25:36 -0400 |
commit | 9af0b4d2ea8ff3285077e9323172460d44cc27dc (patch) | |
tree | cb8b77a99bc6eeb975372543587a9b3dcdd6720c | |
parent | 95c444de337fcf39d16cc4d9b26842177f24256a (diff) | |
download | sway-9af0b4d2ea8ff3285077e9323172460d44cc27dc.tar.xz |
Make fullscreen check for fullscreen parents
This ensures that a child of a fullscreen container cannot
be fullscreened.
-rw-r--r-- | sway/commands/fullscreen.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sway/commands/fullscreen.c b/sway/commands/fullscreen.c index a268ba03..0d7ba112 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; |