mirror of
https://github.com/swaywm/sway.git
synced 2024-11-04 15:33:13 +00:00
Merge pull request #3494 from ianyfan/commands
i3 command behaviour compatibility fixes
This commit is contained in:
commit
71a37ad186
|
@ -40,11 +40,6 @@ 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));
|
parse_boolean(argv[0], container_is_floating(container));
|
||||||
|
|
||||||
|
|
|
@ -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 =
|
||||||
|
|
|
@ -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);
|
||||||
|
|
Loading…
Reference in a new issue