[PATCH 1/5] winex11: Fullscreen windows are never maximized.

Henri Verbeet hverbeet at codeweavers.com
Thu Sep 27 18:06:52 CDT 2012


Some window managers incorrectly set maximized state on fullscreen windows.
---
 dlls/winex11.drv/event.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
index 514f0d4..b5529ab 100644
--- a/dlls/winex11.drv/event.c
+++ b/dlls/winex11.drv/event.c
@@ -998,6 +998,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev )
     HWND parent;
     BOOL root_coords;
     int cx, cy, x = event->x, y = event->y;
+    DWORD style;
 
     if (!hwnd) return;
     if (!(data = get_win_data( hwnd ))) return;
@@ -1061,7 +1062,8 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev )
                hwnd, data->window_rect.right - data->window_rect.left,
                data->window_rect.bottom - data->window_rect.top, cx, cy );
 
-    if (is_net_wm_state_maximized( event->display, data ))
+    style = GetWindowLongW( data->hwnd, GWL_STYLE );
+    if ((style & WS_CAPTION) == WS_CAPTION && is_net_wm_state_maximized( event->display, data ))
     {
         if (!IsZoomed( data->hwnd ))
         {
@@ -1198,7 +1200,7 @@ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL updat
     if (data->iconic && data->wm_state == NormalState)  /* restore window */
     {
         data->iconic = FALSE;
-        if (is_net_wm_state_maximized( event->display, data ))
+        if ((style & WS_CAPTION) == WS_CAPTION && is_net_wm_state_maximized( event->display, data ))
         {
             if ((style & WS_MAXIMIZEBOX) && !(style & WS_DISABLED))
             {
-- 
1.7.8.6




More information about the wine-patches mailing list