niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

explorer: Don't activate the systray icon when showing it.

Browse source 
Fixes a regression introduced by 62c6646d8f,
because SetParent will unconditionally activate the window, causing newly
added icons to deactivate the foreground window.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
This commit is contained in:
Gabriel Ivăncescu 2024-02-06 16:51:21 +02:00 • committed by Alexandre Julliard
parent 26498d93cf
commit 5e7a8f4db0
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
programs/explorer/systray.c
View file

@ -543,6 +543,15 @@ static LRESULT WINAPI tray_icon_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPA
break;
}
case WM_WINDOWPOSCHANGING:
if (icon->display == ICON_DISPLAY_HIDDEN)
{
/* Changing the icon's parent via SetParent would activate it, stealing the focus. */
WINDOWPOS *wp = (WINDOWPOS*)lparam;
wp->flags |= SWP_NOACTIVATE;
}
break;
case WM_WINDOWPOSCHANGED:
update_systray_balloon_position();
break;
@ -566,9 +575,9 @@ static void systray_add_icon( struct icon *icon )
if (icon->display != ICON_DISPLAY_HIDDEN) return; /* already added */
icon->display = nb_displayed++;
SetWindowLongW( icon->window, GWL_STYLE, GetWindowLongW( icon->window, GWL_STYLE ) | WS_CHILD );
SetParent( icon->window, tray_window );
icon->display = nb_displayed++;
pos = get_icon_pos( icon );
SetWindowPos( icon->window, 0, pos.x, pos.y, 0, 0, SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER | SWP_SHOWWINDOW );