diff options
| author |  Brian Ashworth <bosrsf04@gmail.com> | 2019-01-15 02:21:46 -0500 |
|---|---|---|
| committer |  emersion <contact@emersion.fr> | 2019-01-15 09:05:27 +0100 |
| commit | 3087942c35ad8982d1cf93313fc1834ab439293f (patch) | |
| tree | 1d1dbbd5aec4afb0eb25214069724ed1d527c968 /sway/commands/sticky.c | |
| parent | Merge pull request #3422 from RyanDwyer/resize-immediate-siblings (diff) | |
| download | sway-3087942c35ad8982d1cf93313fc1834ab439293f.tar.gz sway-3087942c35ad8982d1cf93313fc1834ab439293f.tar.zst sway-3087942c35ad8982d1cf93313fc1834ab439293f.zip | |
Handle hidden scratchpad containers in commands
This fixes the handling of hidden scratchpad containers for some
commands. For the most part, this just prevents running the commands on
hidden scratchpad containers, but there are some commands that have some
special handling for them.
Diffstat (limited to 'sway/commands/sticky.c')
| -rw-r--r-- | sway/commands/sticky.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sway/commands/sticky.c b/sway/commands/sticky.c index 6cac8a45..15b726cc 100644 --- a/sway/commands/sticky.c +++ b/sway/commands/sticky.c | |||
| @@ -29,7 +29,8 @@ struct cmd_results *cmd_sticky(int argc, char **argv) { | |||
| 29 | 29 | ||
| 30 | container->is_sticky = parse_boolean(argv[0], container->is_sticky); | 30 | container->is_sticky = parse_boolean(argv[0], container->is_sticky); |
| 31 | 31 | ||
| 32 | if (container->is_sticky) { | 32 | if (container->is_sticky && |
| 33 | (!container->scratchpad || container->workspace)) { | ||
| 33 | // move container to active workspace | 34 | // move container to active workspace |
| 34 | struct sway_workspace *active_workspace = | 35 | struct sway_workspace *active_workspace = |
| 35 | output_get_active_workspace(container->workspace->output); | 36 | output_get_active_workspace(container->workspace->output); |