[PATCH 1/3] winex11: Update WM_HINTS and NET_WM_STATE when WM_STATE isn't.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/winex11.drv/window.c | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index e9edc0022c8..d779c031978 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -3086,6 +3086,17 @@ BOOL X11DRV_GetWindowStyleMasks( HWND hwnd, UINT style, UINT ex_style, UINT *sty
 }

+static BOOL get_desired_wm_state( DWORD style, const struct window_rects *rects )
+{
+    if (style & WS_VISIBLE)
+    {
+        if (style & WS_MINIMIZE) return IconicState;
+        if (is_window_rect_mapped( &rects->window )) return NormalState;
+    }
+    return WithdrawnState;
+}
+
+
 /***********************************************************************
  *		WindowPosChanged   (X11DRV.@)
  */
@@ -3160,23 +3171,11 @@ void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, HWND owner_hint, UIN
 #endif
     }

-    if ((new_style & WS_VISIBLE) &&
-        ((new_style & WS_MINIMIZE) || is_window_rect_mapped( &new_rects->window )))
+    window_set_wm_state( data, get_desired_wm_state( new_style, new_rects ), activate );
+    if (!data->wm_state_serial && data->pending_state.wm_state != WithdrawnState)
     {
-        if (!(old_style & WS_VISIBLE))
-        {
-            window_set_wm_state( data, (new_style & WS_MINIMIZE) ? IconicState : NormalState, activate );
-        }
-        else if ((swp_flags & SWP_STATECHANGED) && ((old_style ^ new_style) & WS_MINIMIZE))
-        {
-            window_set_wm_state( data, (new_style & WS_MINIMIZE) ? IconicState : NormalState, activate );
-            update_net_wm_states( data );
-        }
-        else
-        {
-            if (swp_flags & (SWP_FRAMECHANGED|SWP_STATECHANGED)) set_wm_hints( data );
-            update_net_wm_states( data );
-        }
+        if (swp_flags & (SWP_FRAMECHANGED | SWP_STATECHANGED)) set_wm_hints( data );
+        update_net_wm_states( data );
     }

XFlush( data->display );  /* make sure changes are done before we start painting again */