diff options
author | Rostislav Pehlivanov <atomnuker@gmail.com> | 2018-06-27 17:53:13 +0100 |
---|---|---|
committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2018-06-30 11:10:47 +0100 |
commit | e0d0e8f840271ab12533cb16c9a7ccba237adcb3 (patch) | |
tree | a81bf679fc25f89cc09516e1920c4496b2e4c2f8 /sway/desktop/output.c | |
parent | Merge pull request #2173 from emersion/fix-floating-no-frame-event (diff) | |
download | sway-e0d0e8f840271ab12533cb16c9a7ccba237adcb3.tar.gz sway-e0d0e8f840271ab12533cb16c9a7ccba237adcb3.tar.zst sway-e0d0e8f840271ab12533cb16c9a7ccba237adcb3.zip |
Revert "Don't unmaximize floating views"
This reverts commit 97672295ed50d1d6272876c4a3b6b5607cab05c6.
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, | |||
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 { | 648 | } else if (con->sway_view->border != B_NONE) { |
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); |
@@ -815,7 +815,7 @@ static void render_floating_container(struct sway_output *soutput, | |||
815 | if (con->sway_view->border == B_NORMAL) { | 815 | if (con->sway_view->border == B_NORMAL) { |
816 | render_titlebar(soutput, damage, con, con->x, con->y, con->width, | 816 | render_titlebar(soutput, damage, con, con->x, con->y, con->width, |
817 | colors, title_texture, marks_texture); | 817 | colors, title_texture, marks_texture); |
818 | } else { | 818 | } else if (con->sway_view->border != B_NONE) { |
819 | render_top_border(soutput, damage, con, colors); | 819 | render_top_border(soutput, damage, con, colors); |
820 | } | 820 | } |
821 | render_view(soutput, damage, con, colors); | 821 | render_view(soutput, damage, con, colors); |