diff options
| author | Tudor Brindus <me@tbrindus.ca> | 2020-11-03 00:16:15 -0500 |
|---|---|---|
| committer | Brian Ashworth <bosrsf04@gmail.com> | 2020-11-11 20:43:58 -0500 |
| commit | 07042486c3c4b8e7083405ba9b34b1b87f8d396d (patch) | |
| tree | 5ec7b68db2acbc1c68538a08b0b039477e8f8858 /include/sway | |
| parent | a56098a24e43f459d52a638611a9084c9b1a32d8 (diff) | |
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.)
Diffstat (limited to 'include/sway')
| -rw-r--r-- | include/sway/tree/container.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index 136d618b..c9290108 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h @@ -78,6 +78,9 @@ struct sway_container { enum sway_container_layout layout; enum sway_container_layout prev_split_layout; + // Whether stickiness has been enabled on this container. Use + // `container_is_sticky_[or_child]` rather than accessing this field + // directly; it'll also check that the container is floating. bool is_sticky; // For C_ROOT, this has no meaning @@ -367,4 +370,8 @@ bool container_is_scratchpad_hidden(struct sway_container *con); bool container_is_scratchpad_hidden_or_child(struct sway_container *con); +bool container_is_sticky(struct sway_container *con); + +bool container_is_sticky_or_child(struct sway_container *con); + #endif |