mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-18 14:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add using_csd variable to transaction state

Browse source 
This fixes a race condition flicker when unfloating a view which uses
client side decorations.

When the view is floated it has using_csd = true, so the decorations are
not drawn. When unfloating it it changes to false, but this change
wasn't part of transactions so it could potentially render the
decorations around the view while it's waiting for the transaction to
apply.
This commit is contained in:
Ryan Dwyer 2018-08-17 20:25:33 +10:00
parent 32193c7e4d
commit 1801b725e2
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/sway/tree/container.h
View file

@ -83,6 +83,7 @@ struct sway_container_state {
bool border_bottom; bool border_bottom;
bool border_left; bool border_left;
bool border_right; bool border_right;
bool using_csd;
// Workspace properties // Workspace properties
struct sway_container *ws_fullscreen; struct sway_container *ws_fullscreen;

6
sway/desktop/render.c
View file

@ -266,7 +266,7 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage,
render_view_toplevels(view, output, damage, view->swayc->alpha); render_view_toplevels(view, output, damage, view->swayc->alpha);
} }
if (view->using_csd) { if (view->swayc->current.using_csd) {
return; return;
} }
@ -585,7 +585,7 @@ static void render_container_simple(struct sway_output *output,
marks_texture = view->marks_unfocused; marks_texture = view->marks_unfocused;
} }
if (!view->using_csd) { if (!view->swayc->current.using_csd) {
if (state->border == B_NORMAL) { if (state->border == B_NORMAL) {
render_titlebar(output, damage, child, state->swayc_x, render_titlebar(output, damage, child, state->swayc_x,
state->swayc_y, state->swayc_width, colors, state->swayc_y, state->swayc_width, colors,
@ -777,7 +777,7 @@ static void render_floating_container(struct sway_output *soutput,
marks_texture = view->marks_unfocused; marks_texture = view->marks_unfocused;
} }
if (!view->using_csd) { if (!view->swayc->current.using_csd) {
if (con->current.border == B_NORMAL) { if (con->current.border == B_NORMAL) {
render_titlebar(soutput, damage, con, con->current.swayc_x, render_titlebar(soutput, damage, con, con->current.swayc_x,
con->current.swayc_y, con->current.swayc_width, colors, con->current.swayc_y, con->current.swayc_width, colors,

1
sway/desktop/transaction.c
View file

@ -107,6 +107,7 @@ static void copy_pending_state(struct sway_container *container,
state->border_left = view->border_left; state->border_left = view->border_left;
state->border_right = view->border_right; state->border_right = view->border_right;
state->border_bottom = view->border_bottom; state->border_bottom = view->border_bottom;
state->using_csd = view->using_csd;
} else if (container->type == C_WORKSPACE) { } else if (container->type == C_WORKSPACE) {
state->ws_fullscreen = container->sway_workspace->fullscreen; state->ws_fullscreen = container->sway_workspace->fullscreen;
state->ws_floating = container->sway_workspace->floating; state->ws_floating = container->sway_workspace->floating;