From 2c917a8c3453ec54a80581d82bc8a520e822bd56 Mon Sep 17 00:00:00 2001 From: Kenny Levinsen Date: Mon, 22 Feb 2021 19:33:08 +0100 Subject: container: Add container_is_current_floating Needed to check if containers are currently floating from render code, as container_is_floating checks pending state. --- sway/desktop/render.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sway/desktop') 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); -- cgit v1.2.3