diff options
Diffstat (limited to 'sway/desktop/render.c')
-rw-r--r-- | sway/desktop/render.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sway/desktop/render.c b/sway/desktop/render.c index fa27500e..9102dc34 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c | |||
@@ -204,9 +204,9 @@ static void render_view_toplevels(struct sway_view *view, | |||
204 | .alpha = alpha, | 204 | .alpha = alpha, |
205 | }; | 205 | }; |
206 | // Render all toplevels without descending into popups | 206 | // Render all toplevels without descending into popups |
207 | double ox = view->container->current.content_x - | 207 | double ox = view->container->surface_x - |
208 | output->wlr_output->lx - view->geometry.x; | 208 | output->wlr_output->lx - view->geometry.x; |
209 | double oy = view->container->current.content_y - | 209 | double oy = view->container->surface_y - |
210 | output->wlr_output->ly - view->geometry.y; | 210 | output->wlr_output->ly - view->geometry.y; |
211 | output_surface_for_each_surface(output, view->surface, ox, oy, | 211 | output_surface_for_each_surface(output, view->surface, ox, oy, |
212 | render_surface_iterator, &data); | 212 | render_surface_iterator, &data); |
@@ -240,9 +240,9 @@ static void render_saved_view(struct sway_view *view, | |||
240 | return; | 240 | return; |
241 | } | 241 | } |
242 | struct wlr_box box = { | 242 | struct wlr_box box = { |
243 | .x = view->container->current.content_x - output->wlr_output->lx - | 243 | .x = view->container->surface_x - output->wlr_output->lx - |
244 | view->saved_geometry.x, | 244 | view->saved_geometry.x, |
245 | .y = view->container->current.content_y - output->wlr_output->ly - | 245 | .y = view->container->surface_y - output->wlr_output->ly - |
246 | view->saved_geometry.y, | 246 | view->saved_geometry.y, |
247 | .width = view->saved_buffer_width, | 247 | .width = view->saved_buffer_width, |
248 | .height = view->saved_buffer_height, | 248 | .height = view->saved_buffer_height, |
@@ -1004,7 +1004,6 @@ void output_render(struct sway_output *output, struct timespec *when, | |||
1004 | wlr_renderer_clear(renderer, clear_color); | 1004 | wlr_renderer_clear(renderer, clear_color); |
1005 | } | 1005 | } |
1006 | 1006 | ||
1007 | // TODO: handle views smaller than the output | ||
1008 | if (fullscreen_con->view) { | 1007 | if (fullscreen_con->view) { |
1009 | if (fullscreen_con->view->saved_buffer) { | 1008 | if (fullscreen_con->view->saved_buffer) { |
1010 | render_saved_view(fullscreen_con->view, output, damage, 1.0f); | 1009 | render_saved_view(fullscreen_con->view, output, damage, 1.0f); |