diff options
| -rw-r--r-- | include/sway/tree/container.h | 7 | ||||
| -rw-r--r-- | sway/desktop/render.c | 4 | ||||
| -rw-r--r-- | sway/tree/container.c | 11 |
3 files changed, 20 insertions, 2 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index ff3f9599..5c368df2 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h @@ -210,10 +210,17 @@ void container_set_geometry_from_content(struct sway_container *con); /** * Determine if the given container is itself floating. * This will return false for any descendants of a floating container. + * + * Uses pending container state. */ bool container_is_floating(struct sway_container *container); /** + * Same as above, but for current container state. + */ +bool container_is_current_floating(struct sway_container *container); + +/** * Get a container's box in layout coordinates. */ void container_get_box(struct sway_container *container, struct wlr_box *box); diff --git a/sway/desktop/render.c b/sway/desktop/render.c index ce90eae0..f314db73 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c @@ -359,7 +359,7 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage, container_current_parent_layout(con); if (state->border_right) { - if (!container_is_floating(con) && siblings->length == 1 && layout == L_HORIZ) { + if (!container_is_current_floating(con) && siblings->length == 1 && layout == L_HORIZ) { memcpy(&color, colors->indicator, sizeof(float) * 4); } else { memcpy(&color, colors->child_border, sizeof(float) * 4); @@ -374,7 +374,7 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage, } if (state->border_bottom) { - if (!container_is_floating(con) && siblings->length == 1 && layout == L_VERT) { + if (!container_is_current_floating(con) && siblings->length == 1 && layout == L_VERT) { memcpy(&color, colors->indicator, sizeof(float) * 4); } else { memcpy(&color, colors->child_border, sizeof(float) * 4); diff --git a/sway/tree/container.c b/sway/tree/container.c index 8c8dfb3b..79c23274 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -858,6 +858,17 @@ bool container_is_floating(struct sway_container *container) { return false; } +bool container_is_current_floating(struct sway_container *container) { + if (!container->current.parent && container->current.workspace && + list_find(container->current.workspace->floating, container) != -1) { + return true; + } + if (container->scratchpad) { + return true; + } + return false; +} + void container_get_box(struct sway_container *container, struct wlr_box *box) { box->x = container->pending.x; box->y = container->pending.y; |