diff options
| author | Kenny Levinsen <[email protected]> | 2021-02-12 23:22:51 +0100 |
|---|---|---|
| committer | Tudor Brindus <[email protected]> | 2021-02-16 22:05:00 -0500 |
| commit | a047b5ee4a2a67d30d93641ff86531d54b8e0879 (patch) | |
| tree | 271666c6254e4fabf943c1153224059411a5ce56 /sway/commands/sticky.c | |
| parent | 28cadf558090854ace1df1a0a64f5fbc059541c0 (diff) | |
container: Move pending state to state struct
Pending state is currently inlined directly in the container struct,
while the current state is in a state struct. A side-effect of this is
that it is not immediately obvious that pending double-buffered state is
accessed, nor is it obvious what state is double-buffered.
Instead, use the state struct for both current and pending.
Diffstat (limited to 'sway/commands/sticky.c')
| -rw-r--r-- | sway/commands/sticky.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sway/commands/sticky.c b/sway/commands/sticky.c index 3c93a276..9b09a0f9 100644 --- a/sway/commands/sticky.c +++ b/sway/commands/sticky.c @@ -29,14 +29,14 @@ struct cmd_results *cmd_sticky(int argc, char **argv) { !container_is_scratchpad_hidden(container)) { // move container to active workspace struct sway_workspace *active_workspace = - output_get_active_workspace(container->workspace->output); + output_get_active_workspace(container->pending.workspace->output); if (!sway_assert(active_workspace, "Expected output to have a workspace")) { return cmd_results_new(CMD_FAILURE, "Expected output to have a workspace"); } - if (container->workspace != active_workspace) { - struct sway_workspace *old_workspace = container->workspace; + if (container->pending.workspace != active_workspace) { + struct sway_workspace *old_workspace = container->pending.workspace; container_detach(container); workspace_add_floating(active_workspace, container); container_handle_fullscreen_reparent(container); |