Alexandros Frantzis : winewayland.drv: Avoid resizing fullscreen windows.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 89c36c11fd44ec8a4921d05304afb83f907b47ae
URL:    https://gitlab.winehq.org/wine/wine/-/commit/89c36c11fd44ec8a4921d05304afb83...

Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com>
Date:   Tue Oct 10 12:04:12 2023 +0300

winewayland.drv: Avoid resizing fullscreen windows.

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).

---

 dlls/winewayland.drv/wayland_surface.c |  6 +++---
 dlls/winewayland.drv/waylanddrv.h      |  3 +++
 dlls/winewayland.drv/window.c          | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c
index 17d1fffc29b..ae4812ebb08 100644
--- a/dlls/winewayland.drv/wayland_surface.c
+++ b/dlls/winewayland.drv/wayland_surface.c
@@ -324,9 +324,9 @@ void wayland_surface_attach_shm(struct wayland_surface *surface,
  * Checks whether a wayland_surface_config object is compatible with the
  * the provided arguments.
  */
-static BOOL wayland_surface_config_is_compatible(struct wayland_surface_config *conf,
-                                                 int width, int height,
-                                                 enum wayland_surface_config_state state)
+BOOL wayland_surface_config_is_compatible(struct wayland_surface_config *conf,
+                                          int width, int height,
+                                          enum wayland_surface_config_state state)
 {
     static enum wayland_surface_config_state mask =
         WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED;
diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h
index e1dc58bdc80..4bcd9e6706e 100644
--- a/dlls/winewayland.drv/waylanddrv.h
+++ b/dlls/winewayland.drv/waylanddrv.h
@@ -201,6 +201,9 @@ void wayland_surface_attach_shm(struct wayland_surface *surface,
                                 HRGN surface_damage_region) DECLSPEC_HIDDEN;
 struct wayland_surface *wayland_surface_lock_hwnd(HWND hwnd) DECLSPEC_HIDDEN;
 BOOL wayland_surface_reconfigure(struct wayland_surface *surface) DECLSPEC_HIDDEN;
+BOOL wayland_surface_config_is_compatible(struct wayland_surface_config *conf,
+                                          int width, int height,
+                                          enum wayland_surface_config_state state) DECLSPEC_HIDDEN;
 
 /**********************************************************************
  *          Wayland SHM buffer
diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c
index 2854279bd90..57d2f15a06b 100644
--- a/dlls/winewayland.drv/window.c
+++ b/dlls/winewayland.drv/window.c
@@ -434,6 +434,21 @@ static void wayland_configure_window(HWND hwnd)
         flags |= SWP_FRAMECHANGED;
     }
 
+    /* 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->window.rect.right -
+                                                surface->window.rect.left,
+                                             surface->window.rect.bottom -
+                                                surface->window.rect.top,
+                                             surface->window.state))
+    {
+        flags |= SWP_NOSIZE;
+    }
+
     pthread_mutex_unlock(&surface->mutex);
 
     TRACE("processing=%dx%d,%#x\n", width, height, state);