diff options
| author |  Kirill Primak <vyivel@eclair.cafe> | 2022-01-29 23:11:54 +0300 |
|---|---|---|
| committer |  Simon Ser <contact@emersion.fr> | 2022-01-31 11:44:03 +0100 |
| commit | ee7668c1f2b5ba31420d972161d6d43fc1c84bb4 (patch) | |
| tree | db2d114113e60cfa4f5a1c87813c53868e0bf9f1 /sway/commands/move.c | |
| parent | xwayland: listen to `request_activate` event (diff) | |
| download | sway-ee7668c1f2b5ba31420d972161d6d43fc1c84bb4.tar.gz sway-ee7668c1f2b5ba31420d972161d6d43fc1c84bb4.tar.zst sway-ee7668c1f2b5ba31420d972161d6d43fc1c84bb4.zip | |
chore: chase wlr_output_layout_get_box() update
https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3439
Diffstat (limited to 'sway/commands/move.c')
| -rw-r--r-- | sway/commands/move.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c index 1a05a7a6..0d0d9727 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c | |||
| @@ -788,15 +788,15 @@ static struct cmd_results *cmd_move_to_position_pointer( | |||
| 788 | struct wlr_output *output = wlr_output_layout_output_at( | 788 | struct wlr_output *output = wlr_output_layout_output_at( |
| 789 | root->output_layout, cursor->x, cursor->y); | 789 | root->output_layout, cursor->x, cursor->y); |
| 790 | if (output) { | 790 | if (output) { |
| 791 | struct wlr_box *box = | 791 | struct wlr_box box; |
| 792 | wlr_output_layout_get_box(root->output_layout, output); | 792 | wlr_output_layout_get_box(root->output_layout, output, &box); |
| 793 | lx = fmax(lx, box->x); | 793 | lx = fmax(lx, box.x); |
| 794 | ly = fmax(ly, box->y); | 794 | ly = fmax(ly, box.y); |
| 795 | if (lx + container->pending.width > box->x + box->width) { | 795 | if (lx + container->pending.width > box.x + box.width) { |
| 796 | lx = box->x + box->width - container->pending.width; | 796 | lx = box.x + box.width - container->pending.width; |
| 797 | } | 797 | } |
| 798 | if (ly + container->pending.height > box->y + box->height) { | 798 | if (ly + container->pending.height > box.y + box.height) { |
| 799 | ly = box->y + box->height - container->pending.height; | 799 | ly = box.y + box.height - container->pending.height; |
| 800 | } | 800 | } |
| 801 | } | 801 | } |
| 802 | 802 | ||