diff options
-rw-r--r-- | include/sway/tree/container.h | 1 | ||||
-rw-r--r-- | sway/desktop/render.c | 6 | ||||
-rw-r--r-- | sway/desktop/transaction.c | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index b64a2e63..fdcc31ec 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h | |||
@@ -83,6 +83,7 @@ struct sway_container_state { | |||
83 | bool border_bottom; | 83 | bool border_bottom; |
84 | bool border_left; | 84 | bool border_left; |
85 | bool border_right; | 85 | bool border_right; |
86 | bool using_csd; | ||
86 | 87 | ||
87 | // Workspace properties | 88 | // Workspace properties |
88 | struct sway_container *ws_fullscreen; | 89 | struct sway_container *ws_fullscreen; |
diff --git a/sway/desktop/render.c b/sway/desktop/render.c index cdac9c72..6e1e31f0 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c | |||
@@ -266,7 +266,7 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage, | |||
266 | render_view_toplevels(view, output, damage, view->swayc->alpha); | 266 | render_view_toplevels(view, output, damage, view->swayc->alpha); |
267 | } | 267 | } |
268 | 268 | ||
269 | if (view->using_csd) { | 269 | if (view->swayc->current.using_csd) { |
270 | return; | 270 | return; |
271 | } | 271 | } |
272 | 272 | ||
@@ -585,7 +585,7 @@ static void render_container_simple(struct sway_output *output, | |||
585 | marks_texture = view->marks_unfocused; | 585 | marks_texture = view->marks_unfocused; |
586 | } | 586 | } |
587 | 587 | ||
588 | if (!view->using_csd) { | 588 | if (!view->swayc->current.using_csd) { |
589 | if (state->border == B_NORMAL) { | 589 | if (state->border == B_NORMAL) { |
590 | render_titlebar(output, damage, child, state->swayc_x, | 590 | render_titlebar(output, damage, child, state->swayc_x, |
591 | state->swayc_y, state->swayc_width, colors, | 591 | state->swayc_y, state->swayc_width, colors, |
@@ -777,7 +777,7 @@ static void render_floating_container(struct sway_output *soutput, | |||
777 | marks_texture = view->marks_unfocused; | 777 | marks_texture = view->marks_unfocused; |
778 | } | 778 | } |
779 | 779 | ||
780 | if (!view->using_csd) { | 780 | if (!view->swayc->current.using_csd) { |
781 | if (con->current.border == B_NORMAL) { | 781 | if (con->current.border == B_NORMAL) { |
782 | render_titlebar(soutput, damage, con, con->current.swayc_x, | 782 | render_titlebar(soutput, damage, con, con->current.swayc_x, |
783 | con->current.swayc_y, con->current.swayc_width, colors, | 783 | con->current.swayc_y, con->current.swayc_width, colors, |
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c index c08730ce..e89f01d8 100644 --- a/sway/desktop/transaction.c +++ b/sway/desktop/transaction.c | |||
@@ -107,6 +107,7 @@ static void copy_pending_state(struct sway_container *container, | |||
107 | state->border_left = view->border_left; | 107 | state->border_left = view->border_left; |
108 | state->border_right = view->border_right; | 108 | state->border_right = view->border_right; |
109 | state->border_bottom = view->border_bottom; | 109 | state->border_bottom = view->border_bottom; |
110 | state->using_csd = view->using_csd; | ||
110 | } else if (container->type == C_WORKSPACE) { | 111 | } else if (container->type == C_WORKSPACE) { |
111 | state->ws_fullscreen = container->sway_workspace->fullscreen; | 112 | state->ws_fullscreen = container->sway_workspace->fullscreen; |
112 | state->ws_floating = container->sway_workspace->floating; | 113 | state->ws_floating = container->sway_workspace->floating; |