diff options
| author | emersion <contact@emersion.fr> | 2018-06-30 12:28:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-30 12:28:02 +0100 |
| commit | d17ca5d15be2bdeb6541ce0273472ca9a98c9864 (patch) | |
| tree | db09a5845214199b2e56aad3dabdb1373f7596d0 /sway/desktop/output.c | |
| parent | 53c4467573c782b71ab6616e78834b432530f8ed (diff) | |
| parent | f42bf0ad4abe185200b68ebce4848b80366cc474 (diff) | |
| download | sway-d17ca5d15be2bdeb6541ce0273472ca9a98c9864.tar.xz | |
Merge pull request #2171 from atomnuker/master
Revert "Don't unmaximize floating views"
Diffstat (limited to 'sway/desktop/output.c')
| -rw-r--r-- | sway/desktop/output.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |