Alexandre Julliard : winex11: Don' t set the fullscreen hint on maximized windows.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ee45bf9ef48e40df056902e98e5fb0eb2e5ce3fc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ee45bf9ef48e40df056902e98e...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Mar  5 17:20:03 2008 +0100

winex11: Don't set the fullscreen hint on maximized windows.

---

 dlls/winex11.drv/winpos.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c
index e1e36dc..2297829 100644
--- a/dlls/winex11.drv/winpos.c
+++ b/dlls/winex11.drv/winpos.c
@@ -197,13 +197,14 @@ static void update_net_wm_states( Display *display, struct x11drv_win_data *data
     if (!data->managed) return;
     if (!data->mapped) return;
 
-    if (data->whole_rect.left <= 0 && data->whole_rect.right >= screen_width &&
-        data->whole_rect.top <= 0 && data->whole_rect.bottom >= screen_height)
-        new_state |= (1 << NET_WM_STATE_FULLSCREEN);
-
     style = GetWindowLongW( data->hwnd, GWL_STYLE );
     if (style & WS_MAXIMIZE) new_state |= (1 << NET_WM_STATE_MAXIMIZED);
 
+    if (!(style & WS_MAXIMIZE) &&
+        data->whole_rect.left <= 0 && data->whole_rect.right >= screen_width &&
+        data->whole_rect.top <= 0 && data->whole_rect.bottom >= screen_height)
+        new_state |= (1 << NET_WM_STATE_FULLSCREEN);
+
     ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE );
     if (ex_style & WS_EX_TOPMOST)
         new_state |= (1 << NET_WM_STATE_ABOVE);