diff options
| author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-08-19 16:07:11 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-19 16:07:11 +1000 |
| commit | 7f22fab3895ff090d5e26936f4e964e081090164 (patch) | |
| tree | c5d96041e3270b1d1d50f8a42d91652d615c9938 /sway/desktop/render.c | |
| parent | 37e37627cae0a23d9f763cc56378b528f2ff3885 (diff) | |
| parent | d0a24465d75cc7197ee253e1de9fa961071cd034 (diff) | |
| download | sway-7f22fab3895ff090d5e26936f4e964e081090164.tar.xz | |
Merge branch 'master' into commands
Diffstat (limited to 'sway/desktop/render.c')
| -rw-r--r-- | sway/desktop/render.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sway/desktop/render.c b/sway/desktop/render.c index 6e1e31f0..7c48d0d2 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c @@ -193,9 +193,11 @@ static void render_view_toplevels(struct sway_view *view, .alpha = alpha, }; // Render all toplevels without descending into popups - output_surface_for_each_surface(output, view->surface, - view->swayc->current.view_x - output->wlr_output->lx, - view->swayc->current.view_y - output->wlr_output->ly, + double ox = + view->swayc->current.view_x - output->wlr_output->lx - view->geometry.x; + double oy = + view->swayc->current.view_y - output->wlr_output->ly - view->geometry.y; + output_surface_for_each_surface(output, view->surface, ox, oy, render_surface_iterator, &data); } @@ -227,8 +229,10 @@ static void render_saved_view(struct sway_view *view, return; } struct wlr_box box = { - .x = view->swayc->current.view_x - output->swayc->current.swayc_x, - .y = view->swayc->current.view_y - output->swayc->current.swayc_y, + .x = view->swayc->current.view_x - output->swayc->current.swayc_x - + view->saved_geometry.x, + .y = view->swayc->current.view_y - output->swayc->current.swayc_y - + view->saved_geometry.y, .width = view->saved_buffer_width, .height = view->saved_buffer_height, }; |