diff options
| -rw-r--r-- | rootston/desktop.c | 6 | ||||
| -rw-r--r-- | types/wlr_output.c | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/rootston/desktop.c b/rootston/desktop.c index eb18e716..bb3af258 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -36,7 +36,7 @@ static void view_update_output(const struct roots_view *view, struct wlr_box box; view_get_box(view, &box); wl_list_for_each(output, &desktop->outputs, link) { - bool intersected = before->x != -1 && wlr_output_layout_intersects( + bool intersected = before != NULL && wlr_output_layout_intersects( desktop->layout, output->wlr_output, before->x, before->y, before->x + before->width, before->y + before->height); @@ -280,9 +280,7 @@ void view_setup(struct roots_view *view) { } view_center(view); - struct wlr_box before; - view_get_box(view, &before); - view_update_output(view, &before); + view_update_output(view, NULL); } static bool view_at(struct roots_view *view, double lx, double ly, diff --git a/types/wlr_output.c b/types/wlr_output.c index 2ee95162..3f0e1c21 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -253,8 +253,8 @@ void wlr_output_make_current(struct wlr_output *output) { static void output_fullscreen_surface_render(struct wlr_output *output, struct wlr_surface *surface, const struct timespec *when) { - int x = (output->width - surface->current->width) / 2; - int y = (output->height - surface->current->height) / 2; + int x = (output->width - surface->current->buffer_width) / 2; + int y = (output->height - surface->current->buffer_height) / 2; glViewport(0, 0, output->width, output->height); glClearColor(0, 0, 0, 0); |