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 /sway/tree/view.c | |
parent | Add missing includes for wlr_input_device.h (diff) | |
download | sway-07042486c3c4b8e7083405ba9b34b1b87f8d396d.tar.gz sway-07042486c3c4b8e7083405ba9b34b1b87f8d396d.tar.zst sway-07042486c3c4b8e7083405ba9b34b1b87f8d396d.zip |
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 'sway/tree/view.c')
-rw-r--r-- | sway/tree/view.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c index d699b01e..354f2d34 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c | |||
@@ -1244,13 +1244,9 @@ bool view_is_visible(struct sway_view *view) { | |||
1244 | return false; | 1244 | return false; |
1245 | } | 1245 | } |
1246 | } | 1246 | } |
1247 | // Determine if view is nested inside a floating container which is sticky | 1247 | |
1248 | struct sway_container *floater = view->container; | 1248 | if (!container_is_sticky_or_child(view->container) && workspace && |
1249 | while (floater->parent) { | 1249 | !workspace_is_visible(workspace)) { |
1250 | floater = floater->parent; | ||
1251 | } | ||
1252 | bool is_sticky = container_is_floating(floater) && floater->is_sticky; | ||
1253 | if (!is_sticky && workspace && !workspace_is_visible(workspace)) { | ||
1254 | return false; | 1250 | return false; |
1255 | } | 1251 | } |
1256 | // Check view isn't in a tabbed or stacked container on an inactive tab | 1252 | // Check view isn't in a tabbed or stacked container on an inactive tab |