alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

commands: allow tiled containers to be stickied

Browse source 
This also stops stickied containers from losing its sticky status when
it is tiled, allowing it to be immediately stickied when floated again.
This commit is contained in:
Ian Fan 2019-01-22 11:07:32 +00:00
parent 42f8a038c9
commit 34dea3d9d2
3 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/commands/floating.c
View file

@ -45,7 +45,7 @@ struct cmd_results *cmd_floating(int argc, char **argv) {
"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);

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");
};
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 =

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->is_sticky = false;
}
container_end_mouse_operation(container);