aboutsummaryrefslogtreecommitdiff
path: root/sway/desktop
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-06-30 13:23:27 +0100
committerGitHub <noreply@github.com>2018-06-30 13:23:27 +0100
commit9ba72433b6c87086f2772405e09e8ac8c0136a01 (patch)
tree97225bd4edf6f26d59761d78024a9abf199e2457 /sway/desktop
parent09fdcfe7dfa4e53c08a5acfbfd49e1a3b4eea6e3 (diff)
parent0cc24dd9c8b7329c91ae5ebd6ebd13b874eaab17 (diff)
Merge pull request #2179 from atomnuker/master
Fix crash with stacking layout after f42bf0ad4
Diffstat (limited to 'sway/desktop')
-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 e1c44a28..6244ca4a 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -645,7 +645,7 @@ static void render_container_simple(struct sway_output *output,
if (child->sway_view->border == B_NORMAL) {
render_titlebar(output, damage, child, child->x, child->y,
child->width, colors, title_texture, marks_texture);
- } else if (con->sway_view->border != B_NONE) {
+ } else {
render_top_border(output, damage, child, colors);
}
render_view(output, damage, child, colors);