Dmitry Timoshkov : winex11: Change the priority of evaluated window styles to workaround a Metacity bug with handling of utility windows .

[Alexandre Julliard]

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

Author: Dmitry Timoshkov <dmitry(a)codeweavers.com>
Date:   Mon Apr  7 13:37:44 2008 +0900

winex11: Change the priority of evaluated window styles to workaround a Metacity bug with handling of utility windows.

---

 dlls/winex11.drv/window.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 62f215c..919879a 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -944,10 +944,10 @@ void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data )
 
     /* set the WM_WINDOW_TYPE */
     window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL);
-    if (ex_style & WS_EX_TOOLWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_UTILITY);
-    else if (style & WS_THICKFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL);
+    if (style & WS_THICKFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL);
     else if (style & WS_DLGFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG);
     else if (ex_style & WS_EX_DLGMODALFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG);
+    else if (ex_style & WS_EX_TOOLWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_UTILITY);
 
     XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE),
 		    XA_ATOM, 32, PropModeReplace, (unsigned char*)&window_type, 1);