tree/container: introduce `container_is_sticky[_or_child]` functions

To query whether a container is sticky, checking `con->is_sticky` is
insufficient. `container_is_floating_or_child` must also return true;
this led to a lot of repetition.

This commit introduces `container_is_sticky[_or_child]` functions, and
switches all stickiness checks to use them. (Including ones where the
container is already known to be floating, for consistency.)

2 files changed, 4 insertions, 4 deletions

diff --git a/sway/commands/move.c b/sway/commands/move.c
index 876a5616..204596c0 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -482,7 +482,7 @@ static struct cmd_results *cmd_move_container(bool no_auto_back_and_forth,
                         // We have to create the workspace, but if the container is
                         // sticky and the workspace is going to be created on the same
                         // output, we'll bail out first.
-                        if (container->is_sticky && container_is_floating_or_child(container)) {
+                        if (container_is_sticky_or_child(container)) {
                                 struct sway_output *new_output =
                                         workspace_get_initial_output(ws_name);
                                 if (old_output == new_output) {
@@ -521,8 +521,8 @@ static struct cmd_results *cmd_move_container(bool no_auto_back_and_forth,
                 return cmd_move_to_scratchpad();
         }
 
-        if (container->is_sticky && container_is_floating_or_child(container) &&
-                        old_output && node_has_ancestor(destination, &old_output->node)) {
+        if (container_is_sticky_or_child(container) && old_output &&
+                        node_has_ancestor(destination, &old_output->node)) {
                 return cmd_results_new(CMD_FAILURE, "Can't move sticky "
                                 "container to another workspace on the same output");
         }
diff --git a/sway/commands/sticky.c b/sway/commands/sticky.c
index 9df1fe09..3c93a276 100644
--- a/sway/commands/sticky.c
+++ b/sway/commands/sticky.c
@@ -25,7 +25,7 @@ struct cmd_results *cmd_sticky(int argc, char **argv) {
 
         container->is_sticky = parse_boolean(argv[0], container->is_sticky);
 
-        if (container->is_sticky && container_is_floating_or_child(container) &&
+        if (container_is_sticky_or_child(container) &&
                         !container_is_scratchpad_hidden(container)) {
                 // move container to active workspace
                 struct sway_workspace *active_workspace =