From e0d0e8f840271ab12533cb16c9a7ccba237adcb3 Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Wed, 27 Jun 2018 17:53:13 +0100 Subject: Revert "Don't unmaximize floating views" This reverts commit 97672295ed50d1d6272876c4a3b6b5607cab05c6. --- sway/desktop/output.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sway/desktop/output.c') diff --git a/sway/desktop/output.c b/sway/desktop/output.c index f0f1603a..e1c44a28 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 { + } else if (con->sway_view->border != B_NONE) { render_top_border(output, damage, child, colors); } render_view(output, damage, child, colors); @@ -815,7 +815,7 @@ static void render_floating_container(struct sway_output *soutput, if (con->sway_view->border == B_NORMAL) { render_titlebar(soutput, damage, con, con->x, con->y, con->width, colors, title_texture, marks_texture); - } else { + } else if (con->sway_view->border != B_NONE) { render_top_border(soutput, damage, con, colors); } render_view(soutput, damage, con, colors); -- cgit v1.2.3