mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-17 13:42:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #843 from thejan2009/bug/move-container-819

Browse source 
Fix container move when workspace is focused
This commit is contained in:
Drew DeVault 2016-08-07 12:04:08 -04:00 committed by GitHub
parent 9e37a13d7b 61781bbef0
commit b8642ce681
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sway/commands.c
View file

@ -1032,7 +1032,9 @@ static struct cmd_results *cmd_move(int argc, char **argv) {
return error; return error;
} 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_CONTAINER && view->type != C_VIEW) { if (view->type == C_WORKSPACE) {
view = new_container(view, view->layout);
} 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.");
} }
@ -1055,19 +1057,21 @@ static struct cmd_results *cmd_move(int argc, char **argv) {
swayc_t *output = NULL; swayc_t *output = NULL;
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_CONTAINER && view->type != C_VIEW) { if (view->type == C_WORKSPACE) {
view = new_container(view, view->layout);
} 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.");
} else if (!(output = output_by_name(argv[3], &abs_pos))) { } else if (!(output = output_by_name(argv[3], &abs_pos))) {
return cmd_results_new(CMD_FAILURE, "move", return cmd_results_new(CMD_FAILURE, "move",
"Can't find output with name/direction '%s' @ (%i,%i)", argv[3], abs_pos.x, abs_pos.y); "Can't find output with name/direction '%s' @ (%i,%i)", argv[3], abs_pos.x, abs_pos.y);
} else { }
swayc_t *container = get_focused_container(output); swayc_t *container = get_focused_container(output);
if (container->is_floating) { if (container->is_floating) {
move_container_to(view, container->parent); move_container_to(view, container->parent);
} else { } else {
move_container_to(view, container); move_container_to(view, container);
} }
}
} else { } else {
return cmd_results_new(CMD_INVALID, "move", expected_syntax); return cmd_results_new(CMD_INVALID, "move", expected_syntax);
} }