aboutsummaryrefslogtreecommitdiff
path: root/sway/desktop/output.c
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-06-30 22:46:25 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-06-30 22:46:25 +1000
commite396af853b01438f7e5ef34bfa6fd2507d11ce5a (patch)
tree323739dc80680dd774acfdcf43eb76cfe93aa64c /sway/desktop/output.c
parentfc6fde7d90ee031539252cb8832e11c38cfed686 (diff)
parent9ba72433b6c87086f2772405e09e8ac8c0136a01 (diff)
Merge remote-tracking branch 'upstream/master' into atomic
Diffstat (limited to 'sway/desktop/output.c')
-rw-r--r--sway/desktop/output.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index b55a3962..541d765d 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -870,7 +870,7 @@ static void render_floating_container(struct sway_output *soutput,
render_titlebar(soutput, damage, con, con->current.swayc_x,
con->current.swayc_y, con->current.swayc_width, colors,
title_texture, marks_texture);
- } else {
+ } else if (con->current.border != B_NONE) {
render_top_border(soutput, damage, con, colors);
}
render_view(soutput, damage, con, colors);