From: Etaash Mathamsetty <etaash.mathamsetty@gmail.com> --- dlls/winewayland.drv/wayland_surface.c | 14 ++++++++++++-- dlls/winewayland.drv/waylanddrv.h | 1 + dlls/winewayland.drv/window.c | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index 288c1ab1b04..b8749478c53 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -579,10 +579,20 @@ static void wayland_surface_reconfigure_geometry(struct wayland_surface *surface if (!IsRectEmpty(&rect)) { + int width = rect.right - rect.left, height = rect.bottom - rect.top; xdg_surface_set_window_geometry(surface->xdg_surface, rect.left, rect.top, - rect.right - rect.left, - rect.bottom - rect.top); + width, height); + if (surface->window.resizeable) + { + xdg_toplevel_set_min_size(surface->xdg_toplevel, 0, 0); + xdg_toplevel_set_max_size(surface->xdg_toplevel, 0, 0); + } + else + { + xdg_toplevel_set_min_size(surface->xdg_toplevel, width, height); + xdg_toplevel_set_max_size(surface->xdg_toplevel, width, height); + } } } diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 53d3dbbfb15..e572e8632a5 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -240,6 +240,7 @@ struct wayland_window_config BOOL visible; BOOL managed; BOOL minimized; + BOOL resizeable; }; struct wayland_client_surface diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index e3b3b0bed46..4cae1b76e3b 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -174,6 +174,7 @@ static void wayland_win_data_get_config(struct wayland_win_data *data, window_state |= WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED; } + conf->resizeable = !!(style & WS_THICKFRAME); conf->state = window_state; conf->scale = NtUserGetSystemDpiForProcess(0) / 96.0; conf->visible = (style & WS_VISIBLE) == WS_VISIBLE; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11131