diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-05-25 09:32:25 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-01 23:14:58 +1000 |
commit | 754cb7944c2f05b35e39dab9605a184ee9f53efd (patch) | |
tree | 45f7cc8620fb758ad7cb6ca22f7192ef3f6a6d2f | |
parent | Replace is_floating boolean with function (diff) | |
download | sway-754cb7944c2f05b35e39dab9605a184ee9f53efd.tar.gz sway-754cb7944c2f05b35e39dab9605a184ee9f53efd.tar.zst sway-754cb7944c2f05b35e39dab9605a184ee9f53efd.zip |
Respect view's border config for floating containers
-rw-r--r-- | sway/desktop/output.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 4e5d106f..c0e368d0 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -810,8 +810,13 @@ static void render_floating_container(struct sway_output *soutput, | |||
810 | title_texture = con->title_unfocused; | 810 | title_texture = con->title_unfocused; |
811 | marks_texture = view->marks_unfocused; | 811 | marks_texture = view->marks_unfocused; |
812 | } | 812 | } |
813 | render_titlebar(soutput, damage, con, con->x, con->y, con->width, | 813 | |
814 | colors, title_texture, marks_texture); | 814 | if (con->sway_view->border == B_NORMAL) { |
815 | render_titlebar(soutput, damage, con, con->x, con->y, con->width, | ||
816 | colors, title_texture, marks_texture); | ||
817 | } else { | ||
818 | render_top_border(soutput, damage, con, colors); | ||
819 | } | ||
815 | render_view(soutput, damage, con, colors); | 820 | render_view(soutput, damage, con, colors); |
816 | } else { | 821 | } else { |
817 | render_container(soutput, damage, con, false); | 822 | render_container(soutput, damage, con, false); |