diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-04-06 15:57:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-06 15:57:57 -0400 |
| commit | 656ef558a2a8d55cf77cbcc8ce01c861cb78ac97 (patch) | |
| tree | 243104969dc80855d313faf5a0d360dd5508dc52 /sway/commands/move.c | |
| parent | d447460c0153a76a0bc484bb9866cef658b3102f (diff) | |
| parent | 764489e73760534d49760af123cae46109564e86 (diff) | |
Merge pull request #1757 from swaywm/boooooooxes
Break everything^W^WUse wlr_box for sway_container
Diffstat (limited to 'sway/commands/move.c')
| -rw-r--r-- | sway/commands/move.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c index c954ab94..e8668ce7 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c @@ -95,7 +95,8 @@ 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->x, current->y); + source->sway_output->wlr_output, + current->box.x, current->box.y); if (!destination) { return cmd_results_new(CMD_FAILURE, "move workspace", "Can't find output with name/direction '%s'", argv[3]); @@ -124,8 +125,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->width / 2 + current->x, - center_y = current->height / 2 + current->y; + int center_x = current->box.width / 2 + current->box.x, + center_y = current->box.height / 2 + current->box.y; struct sway_container *destination = output_in_direction(argv[3], source->sway_output->wlr_output, center_x, center_y); if (!destination) { |