ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11: Sync the window attributes when switching a window to embedded.

This commit is contained in:
Alexandre Julliard 2010-11-05 13:42:05 +01:00
parent de983c2268
commit 8f24cd05b1
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/winex11.drv/window.c
View File

@ -1356,6 +1356,8 @@ static void set_xembed_flags( Display *display, struct x11drv_win_data *data, un
{ {
unsigned long info[2]; unsigned long info[2];
if (!data->whole_window) return;
info[0] = 0; /* protocol version */ info[0] = 0; /* protocol version */
info[1] = flags; info[1] = flags;
wine_tsx11_lock(); wine_tsx11_lock();
@ -1418,18 +1420,19 @@ static void unmap_window( Display *display, struct x11drv_win_data *data )
*/ */
void make_window_embedded( Display *display, struct x11drv_win_data *data ) void make_window_embedded( Display *display, struct x11drv_win_data *data )
{ {
if (data->mapped) BOOL was_mapped = data->mapped;
{ /* the window cannot be mapped before being embedded */
/* the window cannot be mapped before being embedded */ if (data->mapped) unmap_window( display, data );
unmap_window( display, data );
data->embedded = TRUE; data->embedded = TRUE;
data->managed = TRUE;
SetPropA( data->hwnd, managed_prop, (HANDLE)1 );
sync_window_style( display, data );
if (was_mapped)
map_window( display, data, 0 ); map_window( display, data, 0 );
}
else else
{
data->embedded = TRUE;
set_xembed_flags( display, data, 0 ); set_xembed_flags( display, data, 0 );
}
} }