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

Merge pull request #3494 from ianyfan/commands

Browse source 
i3 command behaviour compatibility fixes
This commit is contained in:
Drew DeVault 2019-01-22 07:55:31 -05:00 committed by GitHub
parent 8ce57f0a77 ec0013b9f5
commit 71a37ad186
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sway/commands/floating.c
View file

@ -40,12 +40,7 @@ struct cmd_results *cmd_floating(int argc, char **argv) {
} }
} }
if (container->scratchpad && !container->workspace) { bool wants_floating =
return cmd_results_new(CMD_FAILURE,
"Cannot set floating status on a hidden scratchpad container");
}
bool wants_floating =
parse_boolean(argv[0], container_is_floating(container)); parse_boolean(argv[0], container_is_floating(container));
container_set_floating(container, wants_floating); container_set_floating(container, wants_floating);

7
sway/commands/sticky.c
View file

@ -22,14 +22,9 @@ struct cmd_results *cmd_sticky(int argc, char **argv) {
return cmd_results_new(CMD_FAILURE, "No current container"); return cmd_results_new(CMD_FAILURE, "No current container");
}; };
if (!container_is_floating(container)) {
return cmd_results_new(CMD_FAILURE,
"Can't set sticky on a tiled container");
}
container->is_sticky = parse_boolean(argv[0], container->is_sticky); container->is_sticky = parse_boolean(argv[0], container->is_sticky);
if (container->is_sticky && if (container->is_sticky && container_is_floating_or_child(container) &&
(!container->scratchpad || container->workspace)) { (!container->scratchpad || container->workspace)) {
// move container to active workspace // move container to active workspace
struct sway_workspace *active_workspace = struct sway_workspace *active_workspace =

1
sway/tree/container.c
View file

@ -708,7 +708,6 @@ void container_set_floating(struct sway_container *container, bool enable) {
container->border = container->saved_border; container->border = container->saved_border;
} }
} }
container->is_sticky = false;
} }
container_end_mouse_operation(container); container_end_mouse_operation(container);