Commit de983c22 authored by Alexandre Julliard's avatar Alexandre Julliard

winex11: Don't try to unmap systray windows, it confuses some systray docks.

parent cdaff0a9
...@@ -432,7 +432,7 @@ void change_systray_owner( Display *display, Window systray_window ) ...@@ -432,7 +432,7 @@ void change_systray_owner( Display *display, Window systray_window )
{ {
struct tray_icon *icon; struct tray_icon *icon;
ERR( "new owner %lx\n", systray_window ); TRACE( "new owner %lx\n", systray_window );
LIST_FOR_EACH_ENTRY( icon, &icon_list, struct tray_icon, entry ) LIST_FOR_EACH_ENTRY( icon, &icon_list, struct tray_icon, entry )
{ {
if (icon->display == -1) continue; if (icon->display == -1) continue;
...@@ -444,10 +444,15 @@ void change_systray_owner( Display *display, Window systray_window ) ...@@ -444,10 +444,15 @@ void change_systray_owner( Display *display, Window systray_window )
/* hide a tray icon */ /* hide a tray icon */
static BOOL hide_icon( struct tray_icon *icon ) static BOOL hide_icon( struct tray_icon *icon )
{ {
struct x11drv_win_data *data;
TRACE( "id=0x%x, hwnd=%p\n", icon->id, icon->owner ); TRACE( "id=0x%x, hwnd=%p\n", icon->id, icon->owner );
if (!icon->window) return TRUE; /* already hidden */ if (!icon->window) return TRUE; /* already hidden */
/* make sure we don't try to unmap it, it confuses some systray docks */
if ((data = X11DRV_get_win_data( icon->window )) && data->embedded) data->mapped = FALSE;
DestroyWindow(icon->window); DestroyWindow(icon->window);
DestroyWindow(icon->tooltip); DestroyWindow(icon->tooltip);
icon->window = 0; icon->window = 0;
......
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