diff options
| author | emersion <contact@emersion.fr> | 2019-03-11 11:21:18 +0100 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2019-04-13 08:31:30 -0600 |
| commit | 1515c56caef9ee670d9ddb6dd748f2ce9d5523f0 (patch) | |
| tree | c18e1e3833d0e6b623b1bf239d4849cc53749dd0 /rootston/xdg_shell.c | |
| parent | 930e37eae97e2ae965f7ae3a05d2fdd700827688 (diff) | |
output: remove lx, ly
Fixes https://github.com/swaywm/wlroots/issues/1610
Diffstat (limited to 'rootston/xdg_shell.c')
| -rw-r--r-- | rootston/xdg_shell.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/rootston/xdg_shell.c b/rootston/xdg_shell.c index de9830e6..60222750 100644 --- a/rootston/xdg_shell.c +++ b/rootston/xdg_shell.c @@ -87,21 +87,20 @@ static void popup_unconstrain(struct roots_xdg_popup *popup) { struct wlr_output *output = wlr_output_layout_output_at(layout, dest_x, dest_y); - if (output == NULL) { return; } - int width = 0, height = 0; - wlr_output_effective_resolution(output, &width, &height); + struct wlr_box *output_box = + wlr_output_layout_get_box(view->desktop->layout, output); // the output box expressed in the coordinate system of the toplevel parent // of the popup struct wlr_box output_toplevel_sx_box = { - .x = output->lx - view->box.x, - .y = output->ly - view->box.y, - .width = width, - .height = height + .x = output_box->x - view->box.x, + .y = output_box->y - view->box.y, + .width = output_box->width, + .height = output_box->height, }; wlr_xdg_popup_unconstrain_from_box( |