Replace is_floating boolean with function

This commit is contained in:
Ryan Dwyer 2018-05-25 09:26:23 +10:00
parent 34f35f0bad
commit aaba7642b3
12 changed files with 44 additions and 36 deletions

View file

@ -28,7 +28,7 @@ struct cmd_results *cmd_floating(int argc, char **argv) {
} else if (strcasecmp(argv[0], "disable") == 0) {
wants_floating = false;
} else if (strcasecmp(argv[0], "toggle") == 0) {
wants_floating = !container->is_floating;
wants_floating = !container_is_floating(container);
} else {
return cmd_results_new(CMD_FAILURE, "floating",
"Expected 'floating <enable|disable|toggle>'");

View file

@ -12,19 +12,15 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
}
struct sway_container *parent = config->handler_context.current_container;
// TODO: floating
/*
if (parent->is_floating) {
return cmd_results_new(CMD_FAILURE, "layout", "Unable to change layout of floating windows");
if (container_is_floating(parent)) {
return cmd_results_new(CMD_FAILURE, "layout",
"Unable to change layout of floating windows");
}
*/
while (parent->type == C_VIEW) {
parent = parent->parent;
}
// TODO: stacks and tabs
if (strcasecmp(argv[0], "default") == 0) {
parent->layout = parent->prev_layout;
if (parent->layout == L_NONE) {

View file

@ -17,7 +17,7 @@ struct cmd_results *cmd_sticky(int argc, char **argv) {
}
struct sway_container *container =
config->handler_context.current_container;
if (!container->is_floating) {
if (!container_is_floating(container)) {
return cmd_results_new(CMD_FAILURE, "sticky",
"Can't set sticky on a tiled container");
}