Skip to content

W
wine-winehq
Commit 66814d0d authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

winex11: Make the tool window flag take precedence when setting the window type.

This prevents some menus from being marked as dialogs.
parent a13078ee
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
dlls/winex11.drv/window.c
View file @ 66814d0d
...@@ -1198,10 +1198,9 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data ) ...@@ -1198,10 +1198,9 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data )
else if (style & WS_MINIMIZEBOX) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); else if (style & WS_MINIMIZEBOX) 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 (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_DLGMODALFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG);
/* many window managers don't handle utility windows very well, so we don't use TYPE_UTILITY here */
else if (ex_style & WS_EX_TOOLWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL);
else if ((style & WS_POPUP) && owner) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); else if ((style & WS_POPUP) && owner) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG);
#if 0 /* many window managers don't handle utility windows very well */
else if (ex_style & WS_EX_TOOLWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_UTILITY);
#endif
else window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); else window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL);
XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE), XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment