From: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/winewayland.drv/wayland_surface.c | 13 +++++++------ dlls/winewayland.drv/waylanddrv.h | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index 906b33dd358..cfeb44508e8 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -304,8 +304,8 @@ void wayland_surface_clear_role(struct wayland_surface *surface) wl_surface_attach(surface->wl_surface, NULL, 0, 0); wl_surface_commit(surface->wl_surface); - surface->buffer_width = 0; - surface->buffer_height = 0; + surface->content_width = 0; + surface->content_height = 0; wl_display_flush(process_wayland.wl_display); } @@ -323,6 +323,7 @@ void wayland_surface_attach_shm(struct wayland_surface *surface, HRGN surface_damage_region) { RGNDATA *surface_damage; + int win_width, win_height; TRACE("surface=%p shm_buffer=%p (%dx%d)\n", surface, shm_buffer, shm_buffer->width, shm_buffer->height); @@ -351,8 +352,8 @@ void wayland_surface_attach_shm(struct wayland_surface *surface, free(surface_damage); } - surface->buffer_width = shm_buffer->width; - surface->buffer_height = shm_buffer->height; + surface->content_width = shm_buffer->width; + surface->content_height = shm_buffer->height; } /********************************************************************** @@ -866,8 +867,8 @@ void wayland_surface_ensure_contents(struct wayland_surface *surface) width = surface->window.rect.right - surface->window.rect.left; height = surface->window.rect.bottom - surface->window.rect.top; needs_contents = surface->window.visible && - (surface->buffer_width != width || - surface->buffer_height != height); + (surface->content_width != width || + surface->content_height != height); TRACE("surface=%p hwnd=%p needs_contents=%d\n", surface, surface->hwnd, needs_contents); diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 40f86526cd2..e5db629a5b1 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -202,7 +202,7 @@ struct wayland_surface BOOL resizing; struct wayland_window_config window; struct wayland_client_surface *client; - int buffer_width, buffer_height; + int content_width, content_height; HCURSOR hcursor; }; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6386