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

Merge pull request #947 from alkino/fix_move_empty_workspace

Browse source 
Can't move an empty workspace
This commit is contained in:
Drew DeVault 2016-10-10 20:51:55 -04:00 committed by GitHub
parent 8d277bc962 5384d3effe
commit 6446e4409f
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sway/commands/move.c
View file

@ -34,6 +34,9 @@ struct cmd_results *cmd_move(int argc, char **argv) {
} else if (strcasecmp(argv[1], "to") == 0 && strcasecmp(argv[2], "workspace") == 0) { } else if (strcasecmp(argv[1], "to") == 0 && strcasecmp(argv[2], "workspace") == 0) {
// move container to workspace x // move container to workspace x
if (view->type == C_WORKSPACE) { if (view->type == C_WORKSPACE) {
if (!view->children || view->children->length == 0) {
return cmd_results_new(CMD_FAILURE, "move", "Cannot move an empty workspace");
}
view = new_container(view, view->layout); view = new_container(view, view->layout);
} if (view->type != C_CONTAINER && view->type != C_VIEW) { } if (view->type != C_CONTAINER && view->type != C_VIEW) {
return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views."); return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views.");
@ -59,6 +62,9 @@ struct cmd_results *cmd_move(int argc, char **argv) {
struct wlc_point abs_pos; struct wlc_point abs_pos;
get_absolute_center_position(view, &abs_pos); get_absolute_center_position(view, &abs_pos);
if (view->type == C_WORKSPACE) { if (view->type == C_WORKSPACE) {
if (!view->children || view->children->length == 0) {
return cmd_results_new(CMD_FAILURE, "move", "Cannot move an empty workspace");
}
view = new_container(view, view->layout); view = new_container(view, view->layout);
} else if (view->type != C_CONTAINER && view->type != C_VIEW) { } else if (view->type != C_CONTAINER && view->type != C_VIEW) {
return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views."); return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views.");