diff options
| author | Drew DeVault <sir@cmpwn.com> | 2019-01-22 07:55:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-22 07:55:31 -0500 |
| commit | 71a37ad186ba3080338b2ecb5a3e640600aefc1f (patch) | |
| tree | 28700e832965f9bac8150f72f02dd440b8e0ca32 /sway/commands | |
| parent | 8ce57f0a77f50315c83bae305e78091cc40175c2 (diff) | |
| parent | ec0013b9f5203f03602fb13ed1b4b0fcd4fb4f5a (diff) | |
Merge pull request #3494 from ianyfan/commands
i3 command behaviour compatibility fixes
Diffstat (limited to 'sway/commands')
| -rw-r--r-- | sway/commands/floating.c | 7 | ||||
| -rw-r--r-- | sway/commands/sticky.c | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/sway/commands/floating.c b/sway/commands/floating.c index 57bf0017..82109369 100644 --- a/sway/commands/floating.c +++ b/sway/commands/floating.c @@ -40,12 +40,7 @@ struct cmd_results *cmd_floating(int argc, char **argv) { } } - if (container->scratchpad && !container->workspace) { - return cmd_results_new(CMD_FAILURE, - "Cannot set floating status on a hidden scratchpad container"); - } - - bool wants_floating = + bool wants_floating = parse_boolean(argv[0], container_is_floating(container)); container_set_floating(container, wants_floating); diff --git a/sway/commands/sticky.c b/sway/commands/sticky.c index 15b726cc..e79af8af 100644 --- a/sway/commands/sticky.c +++ b/sway/commands/sticky.c @@ -22,14 +22,9 @@ struct cmd_results *cmd_sticky(int argc, char **argv) { 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); - if (container->is_sticky && + if (container->is_sticky && container_is_floating_or_child(container) && (!container->scratchpad || container->workspace)) { // move container to active workspace struct sway_workspace *active_workspace = |