move scratchpad: hide visible scratchpad container

This makes it so running `move [to] scratchpad` on a container already
in the scratchpad does not return an error. To match i3's behavior, a
visible scratchpad container will be hidden and a hidden scratchpad
container will be treated as a noop.
This commit is contained in:
Brian Ashworth 2019-02-22 00:10:02 -05:00 committed by Drew DeVault
parent f435562012
commit 8aaba944a8

View file

@ -854,11 +854,11 @@ static struct cmd_results *cmd_move_to_scratchpad(void) {
} }
} }
if (con->scratchpad) { if (!con->scratchpad) {
return cmd_results_new(CMD_INVALID,
"Container is already in the scratchpad");
}
root_scratchpad_add_container(con); root_scratchpad_add_container(con);
} else if (con->workspace) {
root_scratchpad_hide(con);
}
return cmd_results_new(CMD_SUCCESS, NULL); return cmd_results_new(CMD_SUCCESS, NULL);
} }