aboutsummaryrefslogtreecommitdiffstats
path: root/sway/desktop/render.c
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2019-01-28 19:06:42 +1000
committerLibravatar emersion <contact@emersion.fr>2019-01-28 10:35:40 +0100
commit6b8bf10941ec83ac7a6e364b9c34f8c6f74d814a (patch)
tree61a9e61c64fd1b88a79b06a6f9dafeb84e4f8c35 /sway/desktop/render.c
parentAdd note about required scdoc version to README. (diff)
downloadsway-6b8bf10941ec83ac7a6e364b9c34f8c6f74d814a.tar.gz
sway-6b8bf10941ec83ac7a6e364b9c34f8c6f74d814a.tar.zst
sway-6b8bf10941ec83ac7a6e364b9c34f8c6f74d814a.zip
Introduce container_is_scratchpad_hidden
Just a convenience function that improves readability of the code. Other things worth noting: * container_get_siblings and container_sibling_index no longer use the const keyword * container_handle_fullscreen_reparent is only ever called after attaching the container to a workspace, so its con->workspace check has been changed to an assertion
Diffstat (limited to 'sway/desktop/render.c')
-rw-r--r--sway/desktop/render.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index 9102dc34..92e623ef 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -986,8 +986,7 @@ void output_render(struct sway_output *output, struct timespec *when,
986 } 986 }
987 987
988 struct sway_container *fullscreen_con = root->fullscreen_global; 988 struct sway_container *fullscreen_con = root->fullscreen_global;
989 if (fullscreen_con && fullscreen_con->scratchpad && 989 if (fullscreen_con && container_is_scratchpad_hidden(fullscreen_con)) {
990 !fullscreen_con->workspace) {
991 fullscreen_con = NULL; 990 fullscreen_con = NULL;
992 } 991 }
993 if (!fullscreen_con) { 992 if (!fullscreen_con) {