From: Rémi Bernon <rbernon@codeweavers.com> --- dlls/winewayland.drv/wayland_surface.c | 23 +++++++++++++++++------ dlls/winewayland.drv/window.c | 7 ++----- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index c4adadd7f94..1207a3da5b1 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -87,6 +87,7 @@ static void xdg_toplevel_handle_configure(void *private, HWND hwnd = private; uint32_t *state; enum wayland_surface_config_state config_state = 0; + RECT rect = { 0, 0, width, height }; struct wayland_win_data *data; wl_array_for_each(state, states) @@ -113,13 +114,13 @@ static void xdg_toplevel_handle_configure(void *private, } } - TRACE("hwnd=%p %dx%d,%#x\n", hwnd, width, height, config_state); + TRACE("hwnd=%p rect=%s state=%#x\n", hwnd, wine_dbgstr_rect(&rect), config_state); if (!(data = wayland_win_data_get(hwnd))) return; if ((surface = data->wayland_surface) && wayland_surface_is_toplevel(surface)) { - SetRect(&surface->pending.rect, 0, 0, width, height); + surface->pending.rect = map_rect_from_surface(surface, rect); surface->pending.state = config_state; } @@ -156,7 +157,16 @@ void wp_fractional_scale_handle_scale(void* user_data, return; } - surface->window.scale = scale; + /* adjust the surface config rects to the new surface scale, we won't receive a configure event */ + surface->pending.rect = map_rect_to_surface(surface, surface->pending.rect); + surface->requested.rect = map_rect_to_surface(surface, surface->requested.rect); + surface->processing.rect = map_rect_to_surface(surface, surface->processing.rect); + surface->current.rect = map_rect_to_surface(surface, surface->current.rect); + surface->window.scale = scale; + surface->pending.rect = map_rect_from_surface(surface, surface->pending.rect); + surface->requested.rect = map_rect_from_surface(surface, surface->requested.rect); + surface->processing.rect = map_rect_from_surface(surface, surface->processing.rect); + surface->current.rect = map_rect_from_surface(surface, surface->current.rect); /* reattach the client surface as its rect has changed */ if ((client = data->client_surface)) @@ -625,8 +635,6 @@ static void wayland_surface_reconfigure_geometry(struct wayland_surface *surface { wayland_surface_get_rect_in_monitor(surface, &rect); - rect = map_rect_to_surface(surface, rect); - /* If the window rect in the monitor is smaller than required, * fall back to an appropriately sized rect at the top-left. */ if ((surface->current.state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED) && @@ -644,6 +652,8 @@ static void wayland_surface_reconfigure_geometry(struct wayland_surface *surface TRACE("Window is too large for Wayland state, using subregion\n"); } + rect = map_rect_to_surface(surface, rect); + TRACE("hwnd=%p geometry=%s\n", surface->hwnd, wine_dbgstr_rect(&rect)); if (!IsRectEmpty(&rect)) @@ -796,7 +806,7 @@ static void wayland_surface_reconfigure_subsurface(struct wayland_surface *surfa BOOL wayland_surface_reconfigure(struct wayland_surface *surface) { struct wayland_window_config *window = &surface->window; - RECT rect = map_rect_to_surface(surface, surface->window.rect); + RECT rect = window->rect; TRACE("hwnd=%p window=%s,%#x processing=%s,%#x current=%s,%#x\n", surface->hwnd, wine_dbgstr_rect(&rect), window->state, @@ -817,6 +827,7 @@ BOOL wayland_surface_reconfigure(struct wayland_surface *surface) break; } + rect = map_rect_to_surface(surface, rect); wayland_surface_reconfigure_size(surface, rect.right - rect.left, rect.bottom - rect.top); return TRUE; diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index afef743755b..c53211bd38a 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -503,7 +503,7 @@ static void wayland_configure_window(HWND hwnd) BOOL needs_exit_size_move = FALSE; BOOL restoring_from_minimize = FALSE; struct wayland_win_data *data; - RECT rect, surface_rect; + RECT rect; if (!(data = wayland_win_data_get(hwnd))) return; if (!(surface = data->wayland_surface)) @@ -562,14 +562,12 @@ static void wayland_configure_window(HWND hwnd) flags |= SWP_FRAMECHANGED; } - surface_rect = map_rect_to_surface(surface, surface->window.rect); - /* If the window is already fullscreen and its size is compatible with what * the compositor is requesting, don't force a resize, since some applications * are very insistent on a particular fullscreen size (which may not match * the monitor size). */ if ((surface->window.state & WAYLAND_SURFACE_CONFIG_STATE_FULLSCREEN) && - wayland_surface_config_is_compatible(&surface->processing, surface_rect, + wayland_surface_config_is_compatible(&surface->processing, surface->window.rect, surface->window.state)) { flags |= SWP_NOSIZE; @@ -598,7 +596,6 @@ static void wayland_configure_window(HWND hwnd) } SetRect(&rect, 0, 0, width, height); - rect = map_rect_from_surface(surface, rect); OffsetRect(&rect, data->rects.window.left, data->rects.window.top); wayland_win_data_release(data); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11248