Skip to content

W
wine-winehq
Commit 5787c12b authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

winex11: Setting window z-order using a sibling doesn't work with some window managers.

So let's see what happens if we don't set z-order at all in that case.
parent 63504e9e
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 16 deletions
dlls/winex11.drv/window.c
View file @ 5787c12b
...@@ -1048,20 +1048,8 @@ void X11DRV_sync_window_position( Display *display, struct x11drv_win_data *data ...@@ -1048,20 +1048,8 @@ void X11DRV_sync_window_position( Display *display, struct x11drv_win_data *data
changes.stack_mode = Above; changes.stack_mode = Above;
mask |= CWStackMode; mask |= CWStackMode;
} }
else /* should use stack_mode Below but most window managers don't get it right */
{ /* and Above with a sibling doesn't work so well either, so we ignore it */
/* should use stack_mode Below but most window managers don't get it right */
/* so move it above the next one in Z order */
HWND next = GetWindow( data->hwnd, GW_HWNDNEXT );
while (next && !(GetWindowLongW( next, GWL_STYLE ) & WS_VISIBLE))
next = GetWindow( next, GW_HWNDNEXT );
if (next)
{
changes.stack_mode = Above;
changes.sibling = X11DRV_get_whole_window(next);
mask |= CWStackMode | CWSibling;
}
}
} }
/* only the size is allowed to change for the desktop window */ /* only the size is allowed to change for the desktop window */
...@@ -1071,8 +1059,8 @@ void X11DRV_sync_window_position( Display *display, struct x11drv_win_data *data ...@@ -1071,8 +1059,8 @@ void X11DRV_sync_window_position( Display *display, struct x11drv_win_data *data
{ {
DWORD style = GetWindowLongW( data->hwnd, GWL_STYLE ); DWORD style = GetWindowLongW( data->hwnd, GWL_STYLE );
TRACE( "setting win %lx pos %d,%d,%dx%d after %lx changes=%x\n", TRACE( "setting win %p/%lx pos %d,%d,%dx%d after %lx changes=%x\n",
data->whole_window, data->whole_rect.left, data->whole_rect.top, data->hwnd, data->whole_window, data->whole_rect.left, data->whole_rect.top,
data->whole_rect.right - data->whole_rect.left, data->whole_rect.right - data->whole_rect.left,
data->whole_rect.bottom - data->whole_rect.top, changes.sibling, mask ); data->whole_rect.bottom - data->whole_rect.top, changes.sibling, mask );
......
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