winex11: Change the priority of evaluated window styles to workaround a Metacity…

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

winex11: Change the priority of evaluated window styles to workaround a Metacity…
751a71a0 · Dmitry Timoshkov · Alexandre Julliard · 1f35b6e6 · 751a71a0
Commit 751a71a0 authored Apr 07, 2008 by Dmitry Timoshkov Committed by Alexandre Julliard Apr 07, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

window.c dlls/winex11.drv/window.c +2 -2

No files found.
--- 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);
+    if (style & WS_THICKFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL);
-    else 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);