aboutsummaryrefslogtreecommitdiffstats
path: root/sway/desktop/render.c
diff options
context:
space:
mode:
authorLibravatar Kenny Levinsen <kl@kl.wtf>2021-02-22 19:33:08 +0100
committerLibravatar Simon Ser <contact@emersion.fr>2021-02-22 23:55:22 +0100
commit2c917a8c3453ec54a80581d82bc8a520e822bd56 (patch)
treec589766a5462e0e6855ba2b135c0c050804fb830 /sway/desktop/render.c
parentrender: scale titlebars correctly when straddling outputs (diff)
downloadsway-2c917a8c3453ec54a80581d82bc8a520e822bd56.tar.gz
sway-2c917a8c3453ec54a80581d82bc8a520e822bd56.tar.zst
sway-2c917a8c3453ec54a80581d82bc8a520e822bd56.zip
container: Add container_is_current_floating
Needed to check if containers are currently floating from render code, as container_is_floating checks pending state.
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 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,
359 container_current_parent_layout(con); 359 container_current_parent_layout(con);
360 360
361 if (state->border_right) { 361 if (state->border_right) {
362 if (!container_is_floating(con) && siblings->length == 1 && layout == L_HORIZ) { 362 if (!container_is_current_floating(con) && siblings->length == 1 && layout == L_HORIZ) {
363 memcpy(&color, colors->indicator, sizeof(float) * 4); 363 memcpy(&color, colors->indicator, sizeof(float) * 4);
364 } else { 364 } else {
365 memcpy(&color, colors->child_border, sizeof(float) * 4); 365 memcpy(&color, colors->child_border, sizeof(float) * 4);
@@ -374,7 +374,7 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage,
374 } 374 }
375 375
376 if (state->border_bottom) { 376 if (state->border_bottom) {
377 if (!container_is_floating(con) && siblings->length == 1 && layout == L_VERT) { 377 if (!container_is_current_floating(con) && siblings->length == 1 && layout == L_VERT) {
378 memcpy(&color, colors->indicator, sizeof(float) * 4); 378 memcpy(&color, colors->indicator, sizeof(float) * 4);
379 } else { 379 } else {
380 memcpy(&color, colors->child_border, sizeof(float) * 4); 380 memcpy(&color, colors->child_border, sizeof(float) * 4);