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

Use wlr_output_layout_output_at to get output for move to cursor

Browse source
This commit is contained in:
Thayne McCombs 2020-01-21 23:05:39 -07:00 committed by Simon Ser
parent cfa403fc58
commit b20d52f71d
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sway/commands/move.c
View file

@ -766,19 +766,18 @@ static struct cmd_results *cmd_move_to_position_pointer(
double ly = cursor->y - container->height / 2;
/* Correct target coordinates to be in bounds (on screen). */
for (int i = 0; i < root->outputs->length; ++i) {
struct wlr_box box;
output_get_box(root->outputs->items[i], &box);
if (wlr_box_contains_point(&box, cursor->x, cursor->y)) {
lx = fmax(lx, box.x);
ly = fmax(ly, box.y);
if (lx + container->width > box.x + box.width) {
lx = box.x + box.width - container->width;
}
if (ly + container->height > box.y + box.height) {
ly = box.y + box.height - container->height;
}
break;
struct wlr_output *output = wlr_output_layout_output_at(
root->output_layout, cursor->x, cursor->y);
if (output) {
struct wlr_box *box =
wlr_output_layout_get_box(root->output_layout, output);
lx = fmax(lx, box->x);
ly = fmax(ly, box->y);
if (lx + container->width > box->x + box->width) {
lx = box->x + box->width - container->width;
}
if (ly + container->height > box->y + box->height) {
ly = box->y + box->height - container->height;
}
}