From 6b8bf10941ec83ac7a6e364b9c34f8c6f74d814a Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 28 Jan 2019 19:06:42 +1000 Subject: 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 --- sway/tree/root.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'sway/tree/root.c') diff --git a/sway/tree/root.c b/sway/tree/root.c index 476e47a3..6e13d6ce 100644 --- a/sway/tree/root.c +++ b/sway/tree/root.c @@ -310,10 +310,7 @@ void root_for_each_container(void (*f)(struct sway_container *con, void *data), // Scratchpad for (int i = 0; i < root->scratchpad->length; ++i) { struct sway_container *container = root->scratchpad->items[i]; - // If the container has a workspace then it's visible on a workspace - // and will have been iterated in the previous for loop. So we only - // iterate the hidden scratchpad containers here. - if (!container->workspace) { + if (container_is_scratchpad_hidden(container)) { f(container, data); container_for_each_child(container, f, data); } @@ -362,7 +359,7 @@ struct sway_container *root_find_container( // Scratchpad for (int i = 0; i < root->scratchpad->length; ++i) { struct sway_container *container = root->scratchpad->items[i]; - if (!container->workspace) { + if (container_is_scratchpad_hidden(container)) { if (test(container, data)) { return container; } -- cgit v1.2.3