diff options
| author |  Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-30 22:46:25 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-30 22:46:25 +1000 |
| commit | e396af853b01438f7e5ef34bfa6fd2507d11ce5a (patch) | |
| tree | 323739dc80680dd774acfdcf43eb76cfe93aa64c /sway/desktop/output.c | |
| parent | Fix compile error (diff) | |
| parent | Merge pull request #2179 from atomnuker/master (diff) | |
| download | sway-e396af853b01438f7e5ef34bfa6fd2507d11ce5a.tar.gz sway-e396af853b01438f7e5ef34bfa6fd2507d11ce5a.tar.zst sway-e396af853b01438f7e5ef34bfa6fd2507d11ce5a.zip | |
Merge remote-tracking branch 'upstream/master' into atomic
Diffstat (limited to 'sway/desktop/output.c')
| -rw-r--r-- | sway/desktop/output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index b55a3962..541d765d 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
| @@ -870,7 +870,7 @@ static void render_floating_container(struct sway_output *soutput, | |||
| 870 | render_titlebar(soutput, damage, con, con->current.swayc_x, | 870 | render_titlebar(soutput, damage, con, con->current.swayc_x, |
| 871 | con->current.swayc_y, con->current.swayc_width, colors, | 871 | con->current.swayc_y, con->current.swayc_width, colors, |
| 872 | title_texture, marks_texture); | 872 | title_texture, marks_texture); |
| 873 | } else { | 873 | } else if (con->current.border != B_NONE) { |
| 874 | render_top_border(soutput, damage, con, colors); | 874 | render_top_border(soutput, damage, con, colors); |
| 875 | } | 875 | } |
| 876 | render_view(soutput, damage, con, colors); | 876 | render_view(soutput, damage, con, colors); |