mirror of
https://github.com/swaywm/sway.git
synced 2026-03-07 04:34:20 -05:00
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.
This commit is contained in:
parent
28cadf5580
commit
a047b5ee4a
33 changed files with 723 additions and 757 deletions
|
|
@ -40,8 +40,8 @@ struct cmd_results *cmd_floating(int argc, char **argv) {
|
|||
// If the container is in a floating split container,
|
||||
// operate on the split container instead of the child.
|
||||
if (container_is_floating_or_child(container)) {
|
||||
while (container->parent) {
|
||||
container = container->parent;
|
||||
while (container->pending.parent) {
|
||||
container = container->pending.parent;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -51,8 +51,8 @@ struct cmd_results *cmd_floating(int argc, char **argv) {
|
|||
container_set_floating(container, wants_floating);
|
||||
|
||||
// Floating containers in the scratchpad should be ignored
|
||||
if (container->workspace) {
|
||||
arrange_workspace(container->workspace);
|
||||
if (container->pending.workspace) {
|
||||
arrange_workspace(container->pending.workspace);
|
||||
}
|
||||
|
||||
return cmd_results_new(CMD_SUCCESS, NULL);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue