Module: wine Branch: master Commit: 6e643f3b57ea422b4dd871993505e8064e21a7fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e643f3b57ea422b4dd8719935...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Apr 4 13:41:27 2008 +0200
winex11: Avoid updating the wm states inside a ConfigureNotify event.
---
dlls/winex11.drv/winpos.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 00650eb..1779b45 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -426,6 +426,7 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, wine_tsx11_unlock(); data->mapped = TRUE; data->iconic = (new_style & WS_MINIMIZE) != 0; + update_net_wm_states( display, data ); } else if ((swp_flags & SWP_STATECHANGED) && (!data->iconic != !(new_style & WS_MINIMIZE))) { @@ -437,8 +438,12 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, else if (X11DRV_is_window_rect_mapped( rectWindow )) XMapWindow( display, data->whole_window ); wine_tsx11_unlock(); + update_net_wm_states( display, data ); + } + else if (!event_type) + { + update_net_wm_states( display, data ); } - update_net_wm_states( display, data ); } }