summaryrefslogtreecommitdiffstats
path: root/sway/desktop/render.c
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2020-01-05 15:02:22 -0500
committerLibravatar Simon Ser <contact@emersion.fr>2020-01-05 22:16:44 +0100
commitb977c02e354bd5b0282796a4b770f5a7888e81be (patch)
treee614e5b589f87dcb6a38a78328ff177f58b3dc19 /sway/desktop/render.c
parentswaybar: Fix input device removal (diff)
downloadsway-b977c02e354bd5b0282796a4b770f5a7888e81be.tar.gz
sway-b977c02e354bd5b0282796a4b770f5a7888e81be.tar.zst
sway-b977c02e354bd5b0282796a4b770f5a7888e81be.zip
render: do not render indicator on floating views
This adds a check to make it so the indicator is only rendered on views with a parent, which floating views do not. Since floating views do not have a parent, the workspace layout was being incorrectly used to determine whether to show the split indicator previously. This has no impact on floating containers and a view within a floating container will still have indicators rendered appropriately.
Diffstat (limited to 'sway/desktop/render.c')
-rw-r--r--sway/desktop/render.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index 2e66abd4..43a12046 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -339,7 +339,7 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage,
339 container_current_parent_layout(con); 339 container_current_parent_layout(con);
340 340
341 if (state->border_right) { 341 if (state->border_right) {
342 if (siblings->length == 1 && layout == L_HORIZ) { 342 if (con->current.parent && siblings->length == 1 && layout == L_HORIZ) {
343 memcpy(&color, colors->indicator, sizeof(float) * 4); 343 memcpy(&color, colors->indicator, sizeof(float) * 4);
344 } else { 344 } else {
345 memcpy(&color, colors->child_border, sizeof(float) * 4); 345 memcpy(&color, colors->child_border, sizeof(float) * 4);
@@ -354,7 +354,7 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage,
354 } 354 }
355 355
356 if (state->border_bottom) { 356 if (state->border_bottom) {
357 if (siblings->length == 1 && layout == L_VERT) { 357 if (con->current.parent && siblings->length == 1 && layout == L_VERT) {
358 memcpy(&color, colors->indicator, sizeof(float) * 4); 358 memcpy(&color, colors->indicator, sizeof(float) * 4);
359 } else { 359 } else {
360 memcpy(&color, colors->child_border, sizeof(float) * 4); 360 memcpy(&color, colors->child_border, sizeof(float) * 4);