diff options
| author |  Tudor Brindus <me@tbrindus.ca> | 2020-10-04 20:42:06 -0400 |
|---|---|---|
| committer |  Brian Ashworth <bosrsf04@gmail.com> | 2020-10-04 20:54:58 -0400 |
| commit | bc239b2f6b0cf9d29adb8df7e464e7d104cad4bb (patch) | |
| tree | 6fd61b7797910ddab8f35b2e3dabead3432e7fce /sway/desktop | |
| parent | Make focus_follows_mouse work when hovering a layer-shell surface on another ... (diff) | |
| download | sway-bc239b2f6b0cf9d29adb8df7e464e7d104cad4bb.tar.gz sway-bc239b2f6b0cf9d29adb8df7e464e7d104cad4bb.tar.zst sway-bc239b2f6b0cf9d29adb8df7e464e7d104cad4bb.zip | |
desktop/render: show indicators for top-level split
i3 shows indicators for the workspace-level pseudo-split, but Sway does
not, as of b977c02. This commit replaces the floating container check
with a call to `container_is_floating`, which has some more robust
checks in place.
Fixes #5699.
Diffstat (limited to 'sway/desktop')
| -rw-r--r-- | sway/desktop/render.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/desktop/render.c b/sway/desktop/render.c index d3d927c8..3a422293 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c | |||
| @@ -371,7 +371,7 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage, | |||
| 371 | container_current_parent_layout(con); | 371 | container_current_parent_layout(con); |
| 372 | 372 | ||
| 373 | if (state->border_right) { | 373 | if (state->border_right) { |
| 374 | if (con->current.parent && siblings->length == 1 && layout == L_HORIZ) { | 374 | if (!container_is_floating(con) && siblings->length == 1 && layout == L_HORIZ) { |
| 375 | memcpy(&color, colors->indicator, sizeof(float) * 4); | 375 | memcpy(&color, colors->indicator, sizeof(float) * 4); |
| 376 | } else { | 376 | } else { |
| 377 | memcpy(&color, colors->child_border, sizeof(float) * 4); | 377 | memcpy(&color, colors->child_border, sizeof(float) * 4); |
| @@ -386,7 +386,7 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage, | |||
| 386 | } | 386 | } |
| 387 | 387 | ||
| 388 | if (state->border_bottom) { | 388 | if (state->border_bottom) { |
| 389 | if (con->current.parent && siblings->length == 1 && layout == L_VERT) { | 389 | if (!container_is_floating(con) && siblings->length == 1 && layout == L_VERT) { |
| 390 | memcpy(&color, colors->indicator, sizeof(float) * 4); | 390 | memcpy(&color, colors->indicator, sizeof(float) * 4); |
| 391 | } else { | 391 | } else { |
| 392 | memcpy(&color, colors->child_border, sizeof(float) * 4); | 392 | memcpy(&color, colors->child_border, sizeof(float) * 4); |