From 640232eb225058a18f20190235f679caf678e1f7 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Fri, 6 Apr 2018 16:13:26 -0400 Subject: Revert "Break everything^W^WUse wlr_box for sway_container" --- sway/commands/move.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'sway/commands/move.c') diff --git a/sway/commands/move.c b/sway/commands/move.c index e8668ce7..c954ab94 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c @@ -95,8 +95,7 @@ static struct cmd_results *cmd_move_container(struct sway_container *current, } struct sway_container *source = container_parent(current, C_OUTPUT); struct sway_container *destination = output_in_direction(argv[3], - source->sway_output->wlr_output, - current->box.x, current->box.y); + source->sway_output->wlr_output, current->x, current->y); if (!destination) { return cmd_results_new(CMD_FAILURE, "move workspace", "Can't find output with name/direction '%s'", argv[3]); @@ -125,8 +124,8 @@ static struct cmd_results *cmd_move_workspace(struct sway_container *current, return cmd_results_new(CMD_INVALID, "move", expected_syntax); } struct sway_container *source = container_parent(current, C_OUTPUT); - int center_x = current->box.width / 2 + current->box.x, - center_y = current->box.height / 2 + current->box.y; + int center_x = current->width / 2 + current->x, + center_y = current->height / 2 + current->y; struct sway_container *destination = output_in_direction(argv[3], source->sway_output->wlr_output, center_x, center_y); if (!destination) { -- cgit v1.2.3