aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Rostislav Pehlivanov <atomnuker@gmail.com>2018-06-30 12:45:49 +0100
committerLibravatar Rostislav Pehlivanov <atomnuker@gmail.com>2018-06-30 12:45:49 +0100
commit0cc24dd9c8b7329c91ae5ebd6ebd13b874eaab17 (patch)
tree97225bd4edf6f26d59761d78024a9abf199e2457
parentMerge pull request #2175 from apreiml/fix-swaymsg-error-output (diff)
downloadsway-0cc24dd9c8b7329c91ae5ebd6ebd13b874eaab17.tar.gz
sway-0cc24dd9c8b7329c91ae5ebd6ebd13b874eaab17.tar.zst
sway-0cc24dd9c8b7329c91ae5ebd6ebd13b874eaab17.zip
Fix crash with stacking layout after f42bf0ad4
The "simple" rendering function only applies to tiled views.
-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,
645 if (child->sway_view->border == B_NORMAL) { 645 if (child->sway_view->border == B_NORMAL) {
646 render_titlebar(output, damage, child, child->x, child->y, 646 render_titlebar(output, damage, child, child->x, child->y,
647 child->width, colors, title_texture, marks_texture); 647 child->width, colors, title_texture, marks_texture);
648 } else if (con->sway_view->border != B_NONE) { 648 } else {
649 render_top_border(output, damage, child, colors); 649 render_top_border(output, damage, child, colors);
650 } 650 }
651 render_view(output, damage, child, colors); 651 render_view(output, damage, child, colors);