diff options
Diffstat (limited to 'sway/desktop/render.c')
-rw-r--r-- | sway/desktop/render.c | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/sway/desktop/render.c b/sway/desktop/render.c index cb995215..4c85e516 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c | |||
@@ -256,6 +256,10 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage, | |||
256 | render_view_surfaces(view, output, damage, view->swayc->alpha); | 256 | render_view_surfaces(view, output, damage, view->swayc->alpha); |
257 | } | 257 | } |
258 | 258 | ||
259 | if (view->using_csd) { | ||
260 | return; | ||
261 | } | ||
262 | |||
259 | struct wlr_box box; | 263 | struct wlr_box box; |
260 | float output_scale = output->wlr_output->scale; | 264 | float output_scale = output->wlr_output->scale; |
261 | float color[4]; | 265 | float color[4]; |
@@ -571,12 +575,14 @@ static void render_container_simple(struct sway_output *output, | |||
571 | marks_texture = view->marks_unfocused; | 575 | marks_texture = view->marks_unfocused; |
572 | } | 576 | } |
573 | 577 | ||
574 | if (state->border == B_NORMAL) { | 578 | if (!view->using_csd) { |
575 | render_titlebar(output, damage, child, state->swayc_x, | 579 | if (state->border == B_NORMAL) { |
576 | state->swayc_y, state->swayc_width, colors, | 580 | render_titlebar(output, damage, child, state->swayc_x, |
577 | title_texture, marks_texture); | 581 | state->swayc_y, state->swayc_width, colors, |
578 | } else { | 582 | title_texture, marks_texture); |
579 | render_top_border(output, damage, child, colors); | 583 | } else { |
584 | render_top_border(output, damage, child, colors); | ||
585 | } | ||
580 | } | 586 | } |
581 | render_view(output, damage, child, colors); | 587 | render_view(output, damage, child, colors); |
582 | } else { | 588 | } else { |
@@ -761,12 +767,14 @@ static void render_floating_container(struct sway_output *soutput, | |||
761 | marks_texture = view->marks_unfocused; | 767 | marks_texture = view->marks_unfocused; |
762 | } | 768 | } |
763 | 769 | ||
764 | if (con->current.border == B_NORMAL) { | 770 | if (!view->using_csd) { |
765 | render_titlebar(soutput, damage, con, con->current.swayc_x, | 771 | if (con->current.border == B_NORMAL) { |
766 | con->current.swayc_y, con->current.swayc_width, colors, | 772 | render_titlebar(soutput, damage, con, con->current.swayc_x, |
767 | title_texture, marks_texture); | 773 | con->current.swayc_y, con->current.swayc_width, colors, |
768 | } else if (con->current.border != B_NONE) { | 774 | title_texture, marks_texture); |
769 | render_top_border(soutput, damage, con, colors); | 775 | } else if (con->current.border != B_NONE) { |
776 | render_top_border(soutput, damage, con, colors); | ||
777 | } | ||
770 | } | 778 | } |
771 | render_view(soutput, damage, con, colors); | 779 | render_view(soutput, damage, con, colors); |
772 | } else { | 780 | } else { |