diff options
Diffstat (limited to 'sway/desktop/output.c')
-rw-r--r-- | sway/desktop/output.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 3ff4d72..1d9abbf 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -150,9 +150,9 @@ void output_view_for_each_surface(struct sway_output *output, .user_iterator = iterator, .user_data = user_data, .output = output, - .ox = view->container->current.content_x - output->wlr_output->lx + .ox = view->container->current.content_x - output->lx - view->geometry.x, - .oy = view->container->current.content_y - output->wlr_output->ly + .oy = view->container->current.content_y - output->ly - view->geometry.y, .width = view->container->current.content_width, .height = view->container->current.content_height, @@ -169,9 +169,9 @@ void output_view_for_each_popup(struct sway_output *output, .user_iterator = iterator, .user_data = user_data, .output = output, - .ox = view->container->current.content_x - output->wlr_output->lx + .ox = view->container->current.content_x - output->lx - view->geometry.x, - .oy = view->container->current.content_y - output->wlr_output->ly + .oy = view->container->current.content_y - output->ly - view->geometry.y, .width = view->container->current.content_width, .height = view->container->current.content_height, @@ -202,8 +202,8 @@ void output_unmanaged_for_each_surface(struct sway_output *output, wl_list_for_each(unmanaged_surface, unmanaged, link) { struct wlr_xwayland_surface *xsurface = unmanaged_surface->wlr_xwayland_surface; - double ox = unmanaged_surface->lx - output->wlr_output->lx; - double oy = unmanaged_surface->ly - output->wlr_output->ly; + double ox = unmanaged_surface->lx - output->lx; + double oy = unmanaged_surface->ly - output->ly; output_surface_for_each_surface(output, xsurface->surface, ox, oy, iterator, user_data); @@ -216,8 +216,8 @@ void output_drag_icons_for_each_surface(struct sway_output *output, void *user_data) { struct sway_drag_icon *drag_icon; wl_list_for_each(drag_icon, drag_icons, link) { - double ox = drag_icon->x - output->wlr_output->lx; - double oy = drag_icon->y - output->wlr_output->ly; + double ox = drag_icon->x - output->lx; + double oy = drag_icon->y - output->ly; if (drag_icon->wlr_drag_icon->mapped) { output_surface_for_each_surface(output, @@ -463,8 +463,8 @@ void output_damage_from_view(struct sway_output *output, void output_damage_box(struct sway_output *output, struct wlr_box *_box) { struct wlr_box box; memcpy(&box, _box, sizeof(struct wlr_box)); - box.x -= output->wlr_output->lx; - box.y -= output->wlr_output->ly; + box.x -= output->lx; + box.y -= output->ly; scale_box(&box, output->wlr_output->scale); wlr_output_damage_add_box(output->damage, &box); } @@ -484,8 +484,8 @@ void output_damage_whole_container(struct sway_output *output, struct sway_container *con) { // Pad the box by 1px, because the width is a double and might be a fraction struct wlr_box box = { - .x = con->current.x - output->wlr_output->lx - 1, - .y = con->current.y - output->wlr_output->ly - 1, + .x = con->current.x - output->lx - 1, + .y = con->current.y - output->ly - 1, .width = con->current.width + 2, .height = con->current.height + 2, }; |